Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INFRA: migration from tsm to tsx #6877

Merged
merged 27 commits into from
Oct 31, 2024
Merged

INFRA: migration from tsm to tsx #6877

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
cbc56b7
fea: switching tsm to ts-node in packagejson
Sep 12, 2024
984f804
Merge branch 'main' into 6856_tsm_to_ts_node
JerryWu1234 Sep 12, 2024
d1e9b05
feat: ts-node
Sep 19, 2024
b30303f
Merge branch '6856_tsm_to_ts_node' of https://github.com/JerryWu1234/…
Sep 19, 2024
3175c2d
feat: ts-node
Sep 19, 2024
dc7f1e9
feat: ts-node
Sep 19, 2024
961773e
feat: ts-node
Sep 19, 2024
447894c
feat: ts-node
Sep 19, 2024
832e77b
Update qwik-binding-map.ts
JerryWu1234 Sep 19, 2024
077be99
Merge branch 'main' into 6856_tsm_to_ts_node
JerryWu1234 Sep 22, 2024
9b4c16f
Merge branch 'main' into 6856_tsm_to_ts_node
JerryWu1234 Sep 23, 2024
5400426
Merge branch 'main' into 6856_tsm_to_ts_node
JerryWu1234 Sep 27, 2024
913b1d8
Merge branch 'main' into 6856_tsm_to_ts_node
JerryWu1234 Oct 4, 2024
4377c65
fix version
JerryWu1234 Oct 4, 2024
bd33dd1
Merge branch 'main' into 6856_tsm_to_ts_node
JerryWu1234 Oct 11, 2024
87fc242
test
Oct 14, 2024
9c38fb4
Merge branch 'main' into 6856_tsm_to_ts_node
JerryWu1234 Oct 14, 2024
d1ad090
test
Oct 14, 2024
66f5625
test
Oct 14, 2024
b322ebd
test
Oct 14, 2024
d38a112
fix test
Oct 15, 2024
c98f6eb
Merge branch 'main' into 6856_tsm_to_ts_node
JerryWu1234 Oct 15, 2024
327b02d
solve conflict
Oct 22, 2024
9f4c226
solve conflict
Oct 22, 2024
1b6d382
Merge branch 'main' into 6856_tsm_to_ts_node
JerryWu1234 Oct 23, 2024
b491a0d
fix bug
Oct 31, 2024
399c2ab
fix conflict
Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/loud-deers-run.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'create-qwik': major
JerryWu1234 marked this conversation as resolved.
Show resolved Hide resolved
---

migration from tsm to ts node
JerryWu1234 marked this conversation as resolved.
Show resolved Hide resolved
60 changes: 32 additions & 28 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
}
],
"dependencies": {
"esbuild-plugin-raw": "^0.1.8"
"esbuild-plugin-raw": "^0.1.8",
"tsx": "4.19.1"
JerryWu1234 marked this conversation as resolved.
Show resolved Hide resolved
},
"devDependencies": {
"@builder.io/partytown": "0.10.2",
Expand All @@ -110,6 +111,8 @@
"@node-rs/helper": "1.6.0",
"@octokit/action": "6.1.0",
"@playwright/test": "1.40.0",
"@swc/core": "1.7.25",
"@swc/helpers": "0.5.13",
JerryWu1234 marked this conversation as resolved.
Show resolved Hide resolved
"@types/brotli": "1.3.4",
"@types/bun": "1.1.6",
"@types/cross-spawn": "6.0.6",
Expand Down Expand Up @@ -145,6 +148,7 @@
"prettier-plugin-jsdoc": "1.3.0",
"pretty-quick": "4.0.0",
"prompts": "2.4.2",
"regenerator-runtime": "0.14.1",
JerryWu1234 marked this conversation as resolved.
Show resolved Hide resolved
"rollup": "4.19.0",
"semver": "7.6.3",
"simple-git-hooks": "2.11.1",
Expand All @@ -155,10 +159,10 @@
"terser": "5.31.3",
"tmp": "0.2.3",
"tree-kill": "1.2.2",
"tsm": "2.3.0",
"ts-node": "10.9.2",
JerryWu1234 marked this conversation as resolved.
Show resolved Hide resolved
"typescript": "5.4.5",
"undici": "*",
"vfile": "6.0.1",
"vfile": "6.0.2",
"vite": "5.3.5",
"vite-imagetools": "7.0.4",
"vite-plugin-dts": "3.9.1",
Expand All @@ -178,7 +182,7 @@
"pnpm": {
"overrides": {
"typescript": "5.4.5",
"vfile": "6.0.1",
"vfile": "6.0.2",
"@supabase/realtime-js": "2.8.4"
},
"patchedDependencies": {
Expand All @@ -187,35 +191,35 @@
},
"private": true,
"scripts": {
"api.update": "tsm scripts/index.ts --tsc --api --dev",
"build": "tsm scripts/index.ts",
"api.update": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --api --dev",
"build": "tsx --require ./scripts/runBefore.ts scripts/index.ts",
"build.changelog-formatter": "tsc .changeset/changelog-github-custom.ts && mv .changeset/changelog-github-custom.js .changeset/changelog-github-custom.cjs",
"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/",
"build.cli": "tsm scripts/index.ts --cli --dev",
"build.cli.prod": "tsm scripts/index.ts --cli",
"build.core": "tsm scripts/index.ts --tsc --build --qwikcity --api --platform-binding",
"build.eslint": "tsm scripts/index.ts --eslint",
"build.full": "tsm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding --wasm",
"build.local": "tsm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding-wasm-copy",
"build.only_javascript": "tsm scripts/index.ts --tsc --build --api",
"build.cli": "tsx --require ./scripts/runBefore.ts scripts/index.ts --cli --dev",
"build.cli.prod": "tsx --require ./scripts/runBefore.ts scripts/index.ts --cli",
"build.core": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --qwikcity --api --platform-binding",
"build.eslint": "tsx --require ./scripts/runBefore.ts scripts/index.ts --eslint",
"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",
"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",
"build.only_javascript": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api",
"build.packages.docs": "pnpm -C ./packages/docs/ run build",
"build.packages.insights": "pnpm -C ./packages/insights/ run build",
"build.platform": "tsm scripts/index.ts --platform-binding",
"build.platform.copy": "tsm scripts/index.ts --platform-binding-wasm-copy",
"build.qwik-city": "tsm scripts/index.ts --tsc --qwikcity",
"build.validate": "tsm scripts/index.ts --tsc --build --api --eslint --qwikcity --platform-binding --wasm --validate",
"build.vite": "tsm scripts/index.ts --tsc --build --api --qwikcity --eslint --platform-binding-wasm-copy",
"build.wasm": "tsm scripts/index.ts --wasm",
"build.watch": "tsm scripts/index.ts --build --qwikcity --watch --dev --platform-binding",
"build.platform": "tsx --require ./scripts/runBefore.ts scripts/index.ts --platform-binding",
"build.platform.copy": "tsx --require ./scripts/runBefore.ts scripts/index.ts --platform-binding-wasm-copy",
"build.qwik-city": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikcity",
"build.validate": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api --eslint --qwikcity --platform-binding --wasm --validate",
"build.vite": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api --qwikcity --eslint --platform-binding-wasm-copy",
"build.wasm": "tsx --require ./scripts/runBefore.ts scripts/index.ts --wasm",
"build.watch": "tsx --require ./scripts/runBefore.ts scripts/index.ts --build --qwikcity --watch --dev --platform-binding",
"change": "changeset",
"cli": "pnpm build.cli && node packages/create-qwik/dist/create-qwik.cjs && tsm scripts/validate-cli.ts --copy-local-qwik-dist",
"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",
"cli.qwik": "pnpm build.cli && node packages/qwik/dist/qwik-cli.cjs",
"cli.validate": "tsm scripts/validate-cli.ts",
"cli.validate": "tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts",
"deps": "corepack pnpm upgrade -i -r --latest && syncpack fix-mismatches && corepack pnpm dedupe",
"docs.dev": "cd packages/docs && pnpm build.repl-sw && pnpm dev",
"docs.preview": "cd packages/docs && pnpm preview",
"docs.sync": "tsm scripts/docs_sync/index.ts && pnpm fmt",
"eslint.update": "tsm scripts/eslint-docs.ts",
"docs.sync": "tsx --require ./scripts/runBefore.ts scripts/docs_sync/index.ts && pnpm fmt",
"eslint.update": "tsx --require ./scripts/runBefore.ts scripts/eslint-docs.ts",
"fmt": "pnpm prettier.fix && pnpm syncpack format",
"fmt.staged": "pretty-quick --staged",
"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",
Expand All @@ -230,12 +234,12 @@
"preinstall": "npx only-allow pnpm",
"prepare": "simple-git-hooks",
"prettier.fix": "prettier --cache --write .",
"qwik-save-artifacts": "tsm ./scripts/qwik-save-artifacts.ts",
"qwik-save-artifacts": "tsx --require ./scripts/runBefore.ts ./scripts/qwik-save-artifacts.ts",
"release": "changeset publish",
"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",
"release.prepare": "pnpm build --prepare-release",
"serve": "tsm --inspect --conditions=development starters/dev-server.ts 3300",
"serve.debug": "tsm --inspect-brk --conditions=development starters/dev-server.ts 3300",
"serve": "tsx --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3300",
"serve.debug": "tsx --require ./scripts/runBefore.ts --inspect-brk --conditions=development starters/dev-server.ts 3300",
"start": "concurrently \"npm:build.watch\" \"npm:tsc.watch\" -n build,tsc -c green,cyan",
"test": "pnpm build.full && pnpm test.unit && pnpm test.e2e",
"test.e2e": "pnpm test.e2e.chromium && pnpm test.e2e.webkit",
Expand All @@ -253,7 +257,7 @@
"tsc.check": "tsc --noEmit",
"tsc.trace": "tsc -p tsconfig.json --traceResolution > tsc.log",
"tsc.watch": "tsc --noEmit --watch --preserveWatchOutput",
"update.qwik.builds": "tsm scripts/update-qwik-builds.ts packages/docs && tsm scripts/update-qwik-builds.ts packages/insights; pnpm install",
"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",
"vitest": "vitest"
},
"simple-git-hooks": {
Expand Down
2 changes: 1 addition & 1 deletion packages/qwik-city/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"svgo": "^3.3",
"undici": "*",
"valibot": ">=0.36.0 <2",
"vfile": "6.0.1",
"vfile": "6.0.2",
"vite": "^5",
"vite-imagetools": "^7",
"zod": "3.22.4"
Expand Down
Loading