Skip to content

Commit b97b6d2

Browse files
authored
Merge pull request #6877 from JerryWu1234/6856_tsm_to_ts_node
INFRA: migration from tsm to tsx
2 parents 15186b1 + 399c2ab commit b97b6d2

File tree

10 files changed

+382
-118
lines changed

10 files changed

+382
-118
lines changed

.changeset/loud-deers-run.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'create-qwik': patch
3+
---
4+
5+
INFRA: migration from tsm to tsx

package.json

+28-28
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@
156156
"terser": "5.31.3",
157157
"tmp": "0.2.3",
158158
"tree-kill": "1.2.2",
159-
"tsm": "2.3.0",
159+
"tsx": "4.19.1",
160160
"typescript": "5.4.5",
161161
"undici": "*",
162-
"vfile": "6.0.1",
162+
"vfile": "6.0.2",
163163
"vite": "5.3.5",
164164
"vite-imagetools": "7.0.4",
165165
"vite-plugin-dts": "3.9.1",
@@ -179,7 +179,7 @@
179179
"pnpm": {
180180
"overrides": {
181181
"typescript": "5.4.5",
182-
"vfile": "6.0.1",
182+
"vfile": "6.0.2",
183183
"@supabase/realtime-js": "2.8.4"
184184
},
185185
"patchedDependencies": {
@@ -188,35 +188,35 @@
188188
},
189189
"private": true,
190190
"scripts": {
191-
"api.update": "tsm scripts/index.ts --tsc --api --dev",
192-
"build": "tsm scripts/index.ts",
191+
"api.update": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --api --dev",
192+
"build": "tsx --require ./scripts/runBefore.ts scripts/index.ts",
193193
"build.changelog-formatter": "tsc .changeset/changelog-github-custom.ts && mv .changeset/changelog-github-custom.js .changeset/changelog-github-custom.cjs",
194194
"build.clean": "rm -rf packages/qwik/dist/ && rm -rf packages/qwik-city/lib/ && rm -rf packages/docs/dist/ && rm -rf packages/insights/dist/ && rm -rf packages/qwik-labs/lib/ && rm -rf packages/qwik-labs/vite/",
195-
"build.cli": "tsm scripts/index.ts --cli --dev",
196-
"build.cli.prod": "tsm scripts/index.ts --cli",
197-
"build.core": "tsm scripts/index.ts --tsc --build --qwikcity --api --platform-binding",
198-
"build.eslint": "tsm scripts/index.ts --eslint",
199-
"build.full": "tsm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding --wasm",
200-
"build.local": "tsm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding-wasm-copy",
201-
"build.only_javascript": "tsm scripts/index.ts --tsc --build --api",
195+
"build.cli": "tsx --require ./scripts/runBefore.ts scripts/index.ts --cli --dev",
196+
"build.cli.prod": "tsx --require ./scripts/runBefore.ts scripts/index.ts --cli",
197+
"build.core": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --qwikcity --api --platform-binding",
198+
"build.eslint": "tsx --require ./scripts/runBefore.ts scripts/index.ts --eslint",
199+
"build.full": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding --wasm",
200+
"build.local": "tsx --require ./scripts/runBefore.tsscripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding-wasm-copy",
201+
"build.only_javascript": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api",
202202
"build.packages.docs": "pnpm -C ./packages/docs/ run build",
203203
"build.packages.insights": "pnpm -C ./packages/insights/ run build",
204-
"build.platform": "tsm scripts/index.ts --platform-binding",
205-
"build.platform.copy": "tsm scripts/index.ts --platform-binding-wasm-copy",
206-
"build.qwik-city": "tsm scripts/index.ts --tsc --qwikcity",
207-
"build.validate": "tsm scripts/index.ts --tsc --build --api --eslint --qwikcity --platform-binding --wasm --validate",
208-
"build.vite": "tsm scripts/index.ts --tsc --build --api --qwikcity --eslint --platform-binding-wasm-copy",
209-
"build.wasm": "tsm scripts/index.ts --wasm",
210-
"build.watch": "tsm scripts/index.ts --build --qwikcity --watch --dev --platform-binding",
204+
"build.platform": "tsx --require ./scripts/runBefore.ts scripts/index.ts --platform-binding",
205+
"build.platform.copy": "tsx --require ./scripts/runBefore.ts scripts/index.ts --platform-binding-wasm-copy",
206+
"build.qwik-city": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikcity",
207+
"build.validate": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api --eslint --qwikcity --platform-binding --wasm --validate",
208+
"build.vite": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api --qwikcity --eslint --platform-binding-wasm-copy",
209+
"build.wasm": "tsx --require ./scripts/runBefore.ts scripts/index.ts --wasm",
210+
"build.watch": "tsx --require ./scripts/runBefore.ts scripts/index.ts --build --qwikcity --watch --dev --platform-binding",
211211
"change": "changeset",
212-
"cli": "pnpm build.cli && node packages/create-qwik/dist/create-qwik.cjs && tsm scripts/validate-cli.ts --copy-local-qwik-dist",
213-
"cli.qwik": "pnpm build.cli && packages/qwik/qwik-cli.cjs",
214-
"cli.validate": "tsm scripts/validate-cli.ts",
212+
"cli": "pnpm build.cli && node packages/create-qwik/dist/create-qwik.cjs && tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts --copy-local-qwik-dist",
213+
"cli.qwik": "pnpm build.cli && node packages/qwik/dist/qwik-cli.cjs",
214+
"cli.validate": "tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts",
215215
"deps": "corepack pnpm upgrade -i -r --latest && syncpack fix-mismatches && corepack pnpm dedupe",
216216
"docs.dev": "cd packages/docs && pnpm build.repl-sw && pnpm dev",
217217
"docs.preview": "cd packages/docs && pnpm preview",
218-
"docs.sync": "tsm scripts/docs_sync/index.ts && pnpm fmt",
219-
"eslint.update": "tsm scripts/eslint-docs.ts",
218+
"docs.sync": "tsx --require ./scripts/runBefore.ts scripts/docs_sync/index.ts && pnpm fmt",
219+
"eslint.update": "tsx --require ./scripts/runBefore.ts scripts/eslint-docs.ts",
220220
"fmt": "pnpm prettier.fix && pnpm syncpack format",
221221
"fmt.staged": "pretty-quick --staged",
222222
"link.dist": "cd packages/qwik && pnpm link --global && cd ../qwik-city && pnpm link --global && cd ../eslint-plugin-qwik && pnpm link --global && cd ../qwik-react && pnpm link --global",
@@ -231,13 +231,13 @@
231231
"preinstall": "npx only-allow pnpm",
232232
"prepare": "simple-git-hooks",
233233
"prettier.fix": "prettier --cache --write .",
234-
"qwik-push-build-repos": "tsm ./scripts/qwik-push-build-repos.ts",
234+
"qwik-push-build-repos": "tsx --require ./scripts/runBefore.ts ./scripts/qwik-push-build-repos.ts",
235235
"release": "changeset publish",
236236
"release.fixup-package-json": "syncpack fix-mismatches --config syncpack-release-conf.json",
237237
"release.pkg-pr-new": "pnpm dlx pkg-pr-new@^0.0.9 publish --compact --pnpm ./packages/qwik ./packages/qwik-city ./packages/eslint-plugin-qwik ./packages/create-qwik",
238238
"release.prepare": "pnpm build --prepare-release",
239-
"serve": "tsm --inspect --conditions=development starters/dev-server.ts 3300",
240-
"serve.debug": "tsm --inspect-brk --conditions=development starters/dev-server.ts 3300",
239+
"serve": "tsx --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3300",
240+
"serve.debug": "tsx --require ./scripts/runBefore.ts --inspect-brk --conditions=development starters/dev-server.ts 3300",
241241
"start": "concurrently \"npm:build.watch\" \"npm:tsc.watch\" -n build,tsc -c green,cyan",
242242
"test": "pnpm build.full && pnpm test.unit && pnpm test.e2e",
243243
"test.e2e": "pnpm test.e2e.chromium && pnpm test.e2e.webkit",
@@ -255,7 +255,7 @@
255255
"tsc.check": "tsc --noEmit",
256256
"tsc.trace": "tsc -p tsconfig.json --traceResolution > tsc.log",
257257
"tsc.watch": "tsc --noEmit --watch --preserveWatchOutput",
258-
"update.qwik.builds": "tsm scripts/update-qwik-builds.ts packages/docs && tsm scripts/update-qwik-builds.ts packages/insights; pnpm install",
258+
"update.qwik.builds": "tsx --require ./scripts/runBefore.ts scripts/update-qwik-builds.ts packages/docs && tsx scripts/update-qwik-builds.ts packages/insights; pnpm install",
259259
"vitest": "vitest"
260260
},
261261
"simple-git-hooks": {

packages/docs/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@
7373
"build.repl-sw": "vite --config vite.config-repl-sw.mts build",
7474
"build.server": "NODE_OPTIONS=--max-old-space-size=8192 vite build -c adapters/cloudflare-pages/vite.config.mts",
7575
"build.showcase": "pnpm node scripts/showcase.js",
76-
"codesandbox.sync": "tsm codesandbox.sync.ts",
77-
"contributors": "tsm contributors.ts",
76+
"codesandbox.sync": "tsx codesandbox.sync.ts",
77+
"contributors": "tsx contributors.ts",
7878
"deploy": "wrangler pages publish ./dist",
79-
"dev": "tsm check-qwik-build.ts && vite --mode ssr --open",
79+
"dev": "tsx check-qwik-build.ts && vite --mode ssr --open",
8080
"dev.debug": "node --inspect-brk ../../node_modules/vite/bin/vite.js --mode ssr --force",
81-
"prebuild.core": "tsm check-qwik-build.ts",
81+
"prebuild.core": "tsx check-qwik-build.ts",
8282
"preview": "qwik build preview && vite preview --open",
8383
"preview.only": "NODE_DEBUG=net,http node --inspect-brk ../../node_modules/vite/bin/vite.js preview",
8484
"preview.wrangler": "wrangler pages dev ./dist --compatibility-flags=nodejs_als",

packages/insights/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"qManifest.post.local": "curl -X POST -H 'Content-Type: application/json' -d @./dist/q-manifest.json http://localhost:5173/api/v1/221smyuj5gl/post/manifest/",
6666
"qwik": "qwik",
6767
"start": "vite --open --mode ssr",
68-
"test.cluster": "tsm src/cluster.ts",
68+
"test.cluster": "tsx src/cluster.ts",
6969
"test.unit": "vitest",
7070
"test.watch": "vitest --watch"
7171
}

packages/qwik-city/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"svgo": "^3.3",
1111
"undici": "*",
1212
"valibot": ">=0.36.0 <2",
13-
"vfile": "6.0.1",
13+
"vfile": "6.0.2",
14+
"vite": "^5",
1415
"vite-imagetools": "^7",
1516
"zod": "3.22.4"
1617
},

0 commit comments

Comments
 (0)