From cbc56b769351368ba24d83e8f0bd2ad2574563f8 Mon Sep 17 00:00:00 2001 From: wuls Date: Thu, 12 Sep 2024 10:04:38 +0800 Subject: [PATCH 01/14] fea: switching tsm to ts-node in packagejson --- package.json | 47 +++++----- pnpm-lock.yaml | 206 +++++++++++++++++++++++++++++++++++++++---- scripts/index.ts | 2 + scripts/runBefore.ts | 28 ++++++ tsconfig.json | 14 ++- tsm.cjs | 58 ------------ 6 files changed, 258 insertions(+), 97 deletions(-) create mode 100644 scripts/runBefore.ts delete mode 100644 tsm.cjs diff --git a/package.json b/package.json index 988725bf4e4..6d4042cc435 100644 --- a/package.json +++ b/package.json @@ -110,6 +110,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", "@types/brotli": "1.3.4", "@types/bun": "1.1.6", "@types/cross-spawn": "6.0.6", @@ -144,6 +146,7 @@ "prettier-plugin-jsdoc": "1.3.0", "pretty-quick": "4.0.0", "prompts": "2.4.2", + "regenerator-runtime": "^0.14.1", "rollup": "4.19.0", "semver": "7.6.3", "simple-git-hooks": "2.11.1", @@ -152,7 +155,7 @@ "svgo": "3.3.2", "syncpack": "12.3.3", "terser": "5.31.3", - "tsm": "2.3.0", + "ts-node": "^10.9.2", "typescript": "5.4.5", "undici": "*", "vfile": "6.0.1", @@ -189,31 +192,31 @@ "build": "tsm 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": "node --loader ts-node/esm scripts/index.ts --cli --dev", + "build.cli.prod": "node --loader ts-node/esm scripts/index.ts --cli", + "build.core": "node --loader ts-node/esm scripts/index.ts --tsc --build --qwikcity --api --platform-binding", + "build.eslint": "node --loader ts-node/esm scripts/index.ts --eslint", + "build.full": "node --loader ts-node/esm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding --wasm", + "build.local": "node --loader ts-node/esm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding-wasm-copy", + "build.only_javascript": "node --loader ts-node/esm 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": "node --loader ts-node/esm scripts/index.ts --platform-binding", + "build.platform.copy": "node --loader ts-node/esm scripts/index.ts --platform-binding-wasm-copy", + "build.qwik-city": "node --loader ts-node/esm scripts/index.ts --tsc --qwikcity", + "build.validate": "node --loader ts-node/esm scripts/index.ts --tsc --build --api --eslint --qwikcity --platform-binding --wasm --validate", + "build.vite": "node --loader ts-node/esm scripts/index.ts --tsc --build --api --qwikcity --eslint --platform-binding-wasm-copy", + "build.wasm": "node --loader ts-node/esm scripts/index.ts --wasm", + "build.watch": "node --loader ts-node/esm 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.qwik": "pnpm build.cli && node packages/qwik/dist/qwik-cli.cjs", - "cli.validate": "tsm scripts/validate-cli.ts", + "cli.validate": "node --loader ts-node/esm 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": "node --loader ts-node/esm scripts/docs_sync/index.ts && pnpm fmt", + "eslint.update": "node --loader ts-node/esm 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", @@ -228,12 +231,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": "node --loader ts-node/esm ./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": "node --loader ts-node/esm --inspect --conditions=development starters/dev-server.ts 3300", + "serve.debug": "node --loader ts-node/esm --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", @@ -250,7 +253,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": "node --loader ts-node/esm scripts/update-qwik-builds.ts packages/docs && node --loader ts-node/esm scripts/update-qwik-builds.ts packages/insights; pnpm install", "vitest": "vitest" }, "simple-git-hooks": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 10efa3aecf0..353be3c0fb3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,6 +71,12 @@ importers: '@playwright/test': specifier: 1.40.0 version: 1.40.0 + '@swc/core': + specifier: ^1.7.25 + version: 1.7.25(@swc/helpers@0.5.13) + '@swc/helpers': + specifier: ^0.5.13 + version: 0.5.13 '@types/brotli': specifier: 1.3.4 version: 1.3.4 @@ -173,6 +179,9 @@ importers: prompts: specifier: 2.4.2 version: 2.4.2 + regenerator-runtime: + specifier: ^0.14.1 + version: 0.14.1 rollup: specifier: 4.19.0 version: 4.19.0 @@ -197,9 +206,9 @@ importers: terser: specifier: 5.31.3 version: 5.31.3 - tsm: - specifier: 2.3.0 - version: 2.3.0 + ts-node: + specifier: ^10.9.2 + version: 10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5) typescript: specifier: 5.4.5 version: 5.4.5 @@ -379,7 +388,7 @@ importers: version: 2.0.0 tailwindcss: specifier: 3.4.6 - version: 3.4.6(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5)) + version: 3.4.6(ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5)) terser: specifier: 5.31.3 version: 5.31.3 @@ -507,7 +516,7 @@ importers: version: link:../eslint-plugin-qwik netlify-cli: specifier: 17.33.4 - version: 17.33.4(@types/express@4.17.21)(@types/node@20.14.11)(bufferutil@4.0.8)(picomatch@3.0.1)(utf-8-validate@5.0.10) + version: 17.33.4(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/express@4.17.21)(@types/node@20.14.11)(bufferutil@4.0.8)(picomatch@3.0.1)(utf-8-validate@5.0.10) postcss: specifier: 8.4.39 version: 8.4.39 @@ -519,7 +528,7 @@ importers: version: 0.5.14(prettier-plugin-jsdoc@1.3.0(prettier@3.3.3))(prettier@3.3.3) tailwindcss: specifier: 3.4.6 - version: 3.4.6(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5)) + version: 3.4.6(ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5)) typescript: specifier: 5.4.5 version: 5.4.5 @@ -2244,72 +2253,84 @@ packages: engines: {glibc: '>=2.26', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-arm@1.0.1': resolution: {integrity: sha512-FtdMvR4R99FTsD53IA3LxYGghQ82t3yt0ZQ93WMZ2xV3dqrb0E8zq4VHaTOuLEAuA83oDawHV3fd+BsAPadHIQ==} engines: {glibc: '>=2.28', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-s390x@1.0.1': resolution: {integrity: sha512-3+rzfAR1YpMOeA2zZNp+aYEzGNWK4zF3+sdMxuCS3ey9HhDbJ66w6hDSHDMoap32DueFwhhs3vwooAB2MaK4XQ==} engines: {glibc: '>=2.28', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [s390x] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-x64@1.0.1': resolution: {integrity: sha512-3NR1mxFsaSgMMzz1bAnnKbSAI+lHXVTqAHgc1bgzjHuXjo4hlscpUxc0vFSAPKI3yuzdzcZOkq7nDPrP2F8Jgw==} engines: {glibc: '>=2.26', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [x64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linuxmusl-arm64@1.0.1': resolution: {integrity: sha512-5aBRcjHDG/T6jwC3Edl3lP8nl9U2Yo8+oTl5drd1dh9Z1EBfzUKAJFUDTDisDjUwc7N4AjnPGfCA3jl3hY8uDg==} engines: {musl: '>=1.2.2', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm64] os: [linux] + libc: [musl] '@img/sharp-libvips-linuxmusl-x64@1.0.1': resolution: {integrity: sha512-dcT7inI9DBFK6ovfeWRe3hG30h51cBAP5JXlZfx6pzc/Mnf9HFCQDLtYf4MCBjxaaTfjCCjkBxcy3XzOAo5txw==} engines: {musl: '>=1.2.2', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [x64] os: [linux] + libc: [musl] '@img/sharp-linux-arm64@0.33.2': resolution: {integrity: sha512-pz0NNo882vVfqJ0yNInuG9YH71smP4gRSdeL09ukC2YLE6ZyZePAlWKEHgAzJGTiOh8Qkaov6mMIMlEhmLdKew==} engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm64] os: [linux] + libc: [glibc] '@img/sharp-linux-arm@0.33.2': resolution: {integrity: sha512-Fndk/4Zq3vAc4G/qyfXASbS3HBZbKrlnKZLEJzPLrXoJuipFNNwTes71+Ki1hwYW5lch26niRYoZFAtZVf3EGA==} engines: {glibc: '>=2.28', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm] os: [linux] + libc: [glibc] '@img/sharp-linux-s390x@0.33.2': resolution: {integrity: sha512-MBoInDXDppMfhSzbMmOQtGfloVAflS2rP1qPcUIiITMi36Mm5YR7r0ASND99razjQUpHTzjrU1flO76hKvP5RA==} engines: {glibc: '>=2.28', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [s390x] os: [linux] + libc: [glibc] '@img/sharp-linux-x64@0.33.2': resolution: {integrity: sha512-xUT82H5IbXewKkeF5aiooajoO1tQV4PnKfS/OZtb5DDdxS/FCI/uXTVZ35GQ97RZXsycojz/AJ0asoz6p2/H/A==} engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [x64] os: [linux] + libc: [glibc] '@img/sharp-linuxmusl-arm64@0.33.2': resolution: {integrity: sha512-F+0z8JCu/UnMzg8IYW1TMeiViIWBVg7IWP6nE0p5S5EPQxlLd76c8jYemG21X99UzFwgkRo5yz2DS+zbrnxZeA==} engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm64] os: [linux] + libc: [musl] '@img/sharp-linuxmusl-x64@0.33.2': resolution: {integrity: sha512-+ZLE3SQmSL+Fn1gmSaM8uFusW5Y3J9VOf+wMGNnTtJUMUxFhv+P4UPaYEYT8tqnyYVaOVGgMN/zsOxn9pSsO2A==} engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [x64] os: [linux] + libc: [musl] '@img/sharp-wasm32@0.33.2': resolution: {integrity: sha512-fLbTaESVKuQcpm8ffgBD7jLb/CQLcATju/jxtTXR1XCLwbOQt+OL5zPHSDMmp2JZIeq82e18yE0Vv7zh6+6BfQ==} @@ -2861,30 +2882,35 @@ packages: engines: {node: '>= 10.0.0'} cpu: [arm] os: [linux] + libc: [glibc] '@parcel/watcher-linux-arm64-glibc@2.4.1': resolution: {integrity: sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] + libc: [glibc] '@parcel/watcher-linux-arm64-musl@2.4.1': resolution: {integrity: sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] + libc: [musl] '@parcel/watcher-linux-x64-glibc@2.4.1': resolution: {integrity: sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] + libc: [glibc] '@parcel/watcher-linux-x64-musl@2.4.1': resolution: {integrity: sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] + libc: [musl] '@parcel/watcher-wasm@2.4.0': resolution: {integrity: sha512-MNgQ4WCbBybqQ97KwR/hqJGYTg3+s8qHpgIyFWB2qJOBvoJWbXuJGmm4ZkPLq2bMaANqCZqrXwmKYagZTkMKZA==} @@ -2989,46 +3015,55 @@ packages: resolution: {integrity: sha512-2Rn36Ubxdv32NUcfm0wB1tgKqkQuft00PtM23VqLuCUR4N5jcNWDoV5iBC9jeGdgS38WK66ElncprqgMUOyomw==} cpu: [arm] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.19.0': resolution: {integrity: sha512-gJuzIVdq/X1ZA2bHeCGCISe0VWqCoNT8BvkQ+BfsixXwTOndhtLUpOg0A1Fcx/+eA6ei6rMBzlOz4JzmiDw7JQ==} cpu: [arm] os: [linux] + libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.19.0': resolution: {integrity: sha512-0EkX2HYPkSADo9cfeGFoQ7R0/wTKb7q6DdwI4Yn/ULFE1wuRRCHybxpl2goQrx4c/yzK3I8OlgtBu4xvted0ug==} cpu: [arm64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.19.0': resolution: {integrity: sha512-GlIQRj9px52ISomIOEUq/IojLZqzkvRpdP3cLgIE1wUWaiU5Takwlzpz002q0Nxxr1y2ZgxC2obWxjr13lvxNQ==} cpu: [arm64] os: [linux] + libc: [musl] '@rollup/rollup-linux-powerpc64le-gnu@4.19.0': resolution: {integrity: sha512-N6cFJzssruDLUOKfEKeovCKiHcdwVYOT1Hs6dovDQ61+Y9n3Ek4zXvtghPPelt6U0AH4aDGnDLb83uiJMkWYzQ==} cpu: [ppc64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-riscv64-gnu@4.19.0': resolution: {integrity: sha512-2DnD3mkS2uuam/alF+I7M84koGwvn3ZVD7uG+LEWpyzo/bq8+kKnus2EVCkcvh6PlNB8QPNFOz6fWd5N8o1CYg==} cpu: [riscv64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-s390x-gnu@4.19.0': resolution: {integrity: sha512-D6pkaF7OpE7lzlTOFCB2m3Ngzu2ykw40Nka9WmKGUOTS3xcIieHe82slQlNq69sVB04ch73thKYIWz/Ian8DUA==} cpu: [s390x] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.19.0': resolution: {integrity: sha512-HBndjQLP8OsdJNSxpNIN0einbDmRFg9+UQeZV1eiYupIRuZsDEoeGU43NQsS34Pp166DtwQOnpcbV/zQxM+rWA==} cpu: [x64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-musl@4.19.0': resolution: {integrity: sha512-HxfbvfCKJe/RMYJJn0a12eiOI9OOtAUF4G6ozrFUK95BNyoJaSiBjIOHjZskTUffUrB84IPKkFG9H9nEvJGW6A==} cpu: [x64] os: [linux] + libc: [musl] '@rollup/rollup-win32-arm64-msvc@4.19.0': resolution: {integrity: sha512-HxDMKIhmcguGTiP5TsLNolwBUK3nGGUEoV/BO9ldUBoMLBssvh4J0X8pf11i1fTV7WShWItB1bKAKjX4RQeYmg==} @@ -3141,6 +3176,88 @@ packages: '@supabase/supabase-js@2.44.4': resolution: {integrity: sha512-vqtUp8umqcgj+RPUc7LiEcQmgsEWFDPJdJizRJF/5tf2zSlVB+3YbUwyQE/hLagYA8TLvGXe7oAqtYyFde6llw==} + '@swc/core-darwin-arm64@1.7.25': + resolution: {integrity: sha512-cbLNV4vsqSbll7kehJ58hZ9lt+nLlUPF+fmSRVsb4Qasnr0IRDtpT+3Rc87bDNXfkc15Ii80xdp7sU2MVgHn7A==} + engines: {node: '>=10'} + cpu: [arm64] + os: [darwin] + + '@swc/core-darwin-x64@1.7.25': + resolution: {integrity: sha512-kZswLBI8KWWV8VuGIJZd8GM7eWFY5srmlomiWw7j/OtRyRgr8qfX3EmxBAYYZqTEvWdooSc/y3I61lHn/a1tRg==} + engines: {node: '>=10'} + cpu: [x64] + os: [darwin] + + '@swc/core-linux-arm-gnueabihf@1.7.25': + resolution: {integrity: sha512-DV/8BHwdtymoelC1KvefOoyXraIDK0rJIBqjPvtzW9YbkN1hepF7au1deiieJ6+A0smP+4fxtYhrnJ5EjPvylA==} + engines: {node: '>=10'} + cpu: [arm] + os: [linux] + + '@swc/core-linux-arm64-gnu@1.7.25': + resolution: {integrity: sha512-lIx8BeKzpulL2PbLyMUln5Hk164M/PHXquHt6y86sD7Spza6zbCme+/Zr17PRiElqrP8byKC09UZj0K6hONDqQ==} + engines: {node: '>=10'} + cpu: [arm64] + os: [linux] + libc: [glibc] + + '@swc/core-linux-arm64-musl@1.7.25': + resolution: {integrity: sha512-+/I7AzzY4066bvKLTyAZXLL0dPpWhRUh0ja4cZNZ+0Gpn8FmtWDwZKCriIWkDlD1gSuXm8+iOaaLGhEwIquOpQ==} + engines: {node: '>=10'} + cpu: [arm64] + os: [linux] + libc: [musl] + + '@swc/core-linux-x64-gnu@1.7.25': + resolution: {integrity: sha512-BPtnKyiBVMZyN6ml7oHGX9wuSLHN06nT1x1TM9wcSKSx6y+BEKb8jSmzrKzM7K5LnfOiy4+ARCb4HrMkXIQjUg==} + engines: {node: '>=10'} + cpu: [x64] + os: [linux] + libc: [glibc] + + '@swc/core-linux-x64-musl@1.7.25': + resolution: {integrity: sha512-ZlZztuvy2hvfoYg5gYHYuc2mssgzGq1kKanF9kPdICsTmze6t7AvkSfmlTN7/YGuO//yDDJR1GR0EuXwOAJqPw==} + engines: {node: '>=10'} + cpu: [x64] + os: [linux] + libc: [musl] + + '@swc/core-win32-arm64-msvc@1.7.25': + resolution: {integrity: sha512-k3QsHJ+53BVhRUeC7NJOMxdMGexBIhFmL8Ex39vqWVvDZgnOepMFu9/G1pm04xBHSqcb0lioDj5WirAoy4VusQ==} + engines: {node: '>=10'} + cpu: [arm64] + os: [win32] + + '@swc/core-win32-ia32-msvc@1.7.25': + resolution: {integrity: sha512-3PW8LDgS7eIdjeGLNYhO1XLXyZJZ+aLjf79am8+HqfzVkmz+uIK39FcFxeF6A/LUsuQBMa3Geg++rS38kviMEA==} + engines: {node: '>=10'} + cpu: [ia32] + os: [win32] + + '@swc/core-win32-x64-msvc@1.7.25': + resolution: {integrity: sha512-iYpJNfIzPwahwPgddb9PHYichdFoS/2NR4Gaemv9s6nzTguS4vx/YT1oFGwuGMP0RyOdmAN2rEfPh7sJktqWfA==} + engines: {node: '>=10'} + cpu: [x64] + os: [win32] + + '@swc/core@1.7.25': + resolution: {integrity: sha512-EWTWdb0GD+Z9CByvW5j5b9d1cFr9P6hy7TkGgAwnhKxGwzGu8BHTG3ou28KY6P57yZXDVKB0exWmSNRIv6LYCg==} + engines: {node: '>=10'} + peerDependencies: + '@swc/helpers': '*' + peerDependenciesMeta: + '@swc/helpers': + optional: true + + '@swc/counter@0.1.3': + resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} + + '@swc/helpers@0.5.13': + resolution: {integrity: sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==} + + '@swc/types@0.1.12': + resolution: {integrity: sha512-wBJA+SdtkbFhHjTMYH+dEH1y4VpfGdAc2Kw/LK09i9bXd/K6j6PkDcFCEzb6iVfZMkPRrl/q0e3toqTAJdkIVA==} + '@szmarczak/http-timer@5.0.1': resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==} engines: {node: '>=14.16'} @@ -11323,7 +11440,7 @@ snapshots: yaml: 2.4.5 yargs: 17.7.2 - '@netlify/build@29.51.3(@opentelemetry/api@1.8.0)(@types/node@20.14.11)(picomatch@3.0.1)': + '@netlify/build@29.51.3(@opentelemetry/api@1.8.0)(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(picomatch@3.0.1)': dependencies: '@bugsnag/js': 7.25.0 '@netlify/blobs': 7.4.0 @@ -11380,7 +11497,7 @@ snapshots: strip-ansi: 7.1.0 supports-color: 9.4.0 terminal-link: 3.0.0 - ts-node: 10.9.2(@types/node@20.14.11)(typescript@5.4.5) + ts-node: 10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5) typescript: 5.4.5 uuid: 9.0.1 yargs: 17.7.2 @@ -12049,6 +12166,63 @@ snapshots: transitivePeerDependencies: - supports-color + '@swc/core-darwin-arm64@1.7.25': + optional: true + + '@swc/core-darwin-x64@1.7.25': + optional: true + + '@swc/core-linux-arm-gnueabihf@1.7.25': + optional: true + + '@swc/core-linux-arm64-gnu@1.7.25': + optional: true + + '@swc/core-linux-arm64-musl@1.7.25': + optional: true + + '@swc/core-linux-x64-gnu@1.7.25': + optional: true + + '@swc/core-linux-x64-musl@1.7.25': + optional: true + + '@swc/core-win32-arm64-msvc@1.7.25': + optional: true + + '@swc/core-win32-ia32-msvc@1.7.25': + optional: true + + '@swc/core-win32-x64-msvc@1.7.25': + optional: true + + '@swc/core@1.7.25(@swc/helpers@0.5.13)': + dependencies: + '@swc/counter': 0.1.3 + '@swc/types': 0.1.12 + optionalDependencies: + '@swc/core-darwin-arm64': 1.7.25 + '@swc/core-darwin-x64': 1.7.25 + '@swc/core-linux-arm-gnueabihf': 1.7.25 + '@swc/core-linux-arm64-gnu': 1.7.25 + '@swc/core-linux-arm64-musl': 1.7.25 + '@swc/core-linux-x64-gnu': 1.7.25 + '@swc/core-linux-x64-musl': 1.7.25 + '@swc/core-win32-arm64-msvc': 1.7.25 + '@swc/core-win32-ia32-msvc': 1.7.25 + '@swc/core-win32-x64-msvc': 1.7.25 + '@swc/helpers': 0.5.13 + + '@swc/counter@0.1.3': {} + + '@swc/helpers@0.5.13': + dependencies: + tslib: 2.6.2 + + '@swc/types@0.1.12': + dependencies: + '@swc/counter': 0.1.3 + '@szmarczak/http-timer@5.0.1': dependencies: defer-to-connect: 2.0.1 @@ -16842,12 +17016,12 @@ snapshots: nested-error-stacks@2.1.1: {} - netlify-cli@17.33.4(@types/express@4.17.21)(@types/node@20.14.11)(bufferutil@4.0.8)(picomatch@3.0.1)(utf-8-validate@5.0.10): + netlify-cli@17.33.4(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/express@4.17.21)(@types/node@20.14.11)(bufferutil@4.0.8)(picomatch@3.0.1)(utf-8-validate@5.0.10): dependencies: '@bugsnag/js': 7.25.0 '@fastify/static': 7.0.4 '@netlify/blobs': 7.4.0 - '@netlify/build': 29.51.3(@opentelemetry/api@1.8.0)(@types/node@20.14.11)(picomatch@3.0.1) + '@netlify/build': 29.51.3(@opentelemetry/api@1.8.0)(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(picomatch@3.0.1) '@netlify/build-info': 7.14.1 '@netlify/config': 20.17.1 '@netlify/edge-bundler': 12.2.2(supports-color@9.4.0) @@ -17589,13 +17763,13 @@ snapshots: camelcase-css: 2.0.1 postcss: 8.4.39 - postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5)): + postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5)): dependencies: lilconfig: 3.1.1 yaml: 2.4.5 optionalDependencies: postcss: 8.4.39 - ts-node: 10.9.2(@types/node@20.14.11)(typescript@5.4.5) + ts-node: 10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5) postcss-nested@6.0.1(postcss@8.4.39): dependencies: @@ -18776,7 +18950,7 @@ snapshots: transitivePeerDependencies: - supports-color - tailwindcss@3.4.6(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5)): + tailwindcss@3.4.6(ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5)): dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 @@ -18795,7 +18969,7 @@ snapshots: postcss: 8.4.39 postcss-import: 15.1.0(postcss@8.4.39) postcss-js: 4.0.1(postcss@8.4.39) - postcss-load-config: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5)) + postcss-load-config: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5)) postcss-nested: 6.0.1(postcss@8.4.39) postcss-selector-parser: 6.0.15 resolve: 1.22.8 @@ -18971,7 +19145,7 @@ snapshots: ts-interface-checker@0.1.13: {} - ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5): + ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.9 @@ -18988,6 +19162,8 @@ snapshots: typescript: 5.4.5 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + optionalDependencies: + '@swc/core': 1.7.25(@swc/helpers@0.5.13) ts-toolbelt@9.6.0: {} diff --git a/scripts/index.ts b/scripts/index.ts index b087aef9090..a2667ff0f19 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -5,6 +5,7 @@ */ import { build } from './build'; import { loadConfig } from './util'; +import { polyfill } from './runBefore'; const args = process.argv.slice(2); @@ -13,5 +14,6 @@ const args = process.argv.slice(2); const config = loadConfig(args); config.esmNode = true; +polyfill(); // let's do this! build(config); diff --git a/scripts/runBefore.ts b/scripts/runBefore.ts new file mode 100644 index 00000000000..f54be467393 --- /dev/null +++ b/scripts/runBefore.ts @@ -0,0 +1,28 @@ +declare global { + var qTest: boolean; + var qRuntimeQrl: boolean; + var qDev: boolean; + var qInspector: boolean; +} + +export function polyfill() { + globalThis.qTest = true; + globalThis.qRuntimeQrl = true; + globalThis.qDev = true; + globalThis.qInspector = false; + if ( + typeof global !== 'undefined' && + typeof globalThis.fetch !== 'function' && + typeof process !== 'undefined' && + process.versions.node + ) { + if (!globalThis.fetch) { + const { fetch, Headers, Request, Response, FormData } = require('undici'); + globalThis.fetch = fetch; + globalThis.Headers = Headers; + globalThis.Request = Request; + globalThis.Response = Response; + globalThis.FormData = FormData; + } + } +} diff --git a/tsconfig.json b/tsconfig.json index 94cb069f230..5ba91b0015d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,8 +1,8 @@ { "compilerOptions": { "incremental": true, - "target": "ES2020", - "module": "ES2020", + "target": "ESNext", + "module": "ESNext", "lib": ["es2021", "DOM", "webworker", "DOM.Iterable"], "resolveJsonModule": true, "jsx": "react-jsx", @@ -40,6 +40,16 @@ "forceConsistentCasingInFileNames": true, "rootDir": "." }, + "ts-node": { + "experimentalSpecifierResolution": "node", + "transpileOnly": true, + "esm": true, + "swc": true, + "compilerOptions": { + "jsxFactory": "qwikJsx.h", + "jsxFragmentFactory": "qwikJsx.Fragment" + } + }, "include": [ "packages/create-qwik", "packages/qwik-auth", diff --git a/tsm.cjs b/tsm.cjs deleted file mode 100644 index f4eedc6d7cb..00000000000 --- a/tsm.cjs +++ /dev/null @@ -1,58 +0,0 @@ -const { join } = require('node:path'); -const { pathToFileURL } = require('node:url'); - -const corePath = pathToFileURL(join(__dirname, 'packages', 'qwik', 'src', 'core', 'index.ts')); - -const bannerTS = ` -globalThis.qTest = true; -globalThis.qRuntimeQrl = true; -globalThis.qDev = true; -`; - -const bannerTSX = ` -globalThis.qTest = true; -globalThis.qRuntimeQrl = true; -globalThis.qDev = true; -globalThis.qInspector = false; -import * as qwikJsx from "${corePath}";`; - -if ( - typeof global !== 'undefined' && - typeof globalThis.fetch !== 'function' && - typeof process !== 'undefined' && - process.versions.node -) { - if (!globalThis.fetch) { - const { fetch, Headers, Request, Response, FormData } = require('undici'); - globalThis.fetch = fetch; - globalThis.Headers = Headers; - globalThis.Request = Request; - globalThis.Response = Response; - globalThis.FormData = FormData; - } -} -module.exports = { - common: { - minifyWhitespace: true, - target: 'es2020', - }, - sourcemap: 'inline', - config: { - '.html': { - loader: 'text', - }, - '.tsx': { - jsxFactory: 'qwikJsx.h', - jsxFragment: 'qwikJsx.Fragment', - banner: bannerTSX, - target: 'es2020', - loader: 'tsx', - minify: false, - }, - '.ts': { - loader: 'ts', - banner: bannerTS, - minify: false, - }, - }, -}; From d1e9b05a4cae5feda45e194d8ceafcc66164af3f Mon Sep 17 00:00:00 2001 From: wuls Date: Thu, 19 Sep 2024 09:28:58 +0800 Subject: [PATCH 02/14] feat: ts-node --- .changeset/loud-deers-run.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/loud-deers-run.md diff --git a/.changeset/loud-deers-run.md b/.changeset/loud-deers-run.md new file mode 100644 index 00000000000..ba3415aed33 --- /dev/null +++ b/.changeset/loud-deers-run.md @@ -0,0 +1,5 @@ +--- +'create-qwik': major +--- + +migration from tsm to ts node From 3175c2d697a2e3058b2ef7f5adecc26e70d7a1c2 Mon Sep 17 00:00:00 2001 From: wuls Date: Thu, 19 Sep 2024 10:14:01 +0800 Subject: [PATCH 03/14] feat: ts-node --- package.json | 48 +++++++++---------- .../src/optimizer/src/qwik-binding-map.ts | 28 ----------- scripts/index.ts | 2 - scripts/runBefore.ts | 15 +++--- 4 files changed, 31 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index 6d4042cc435..b76d10d7f82 100644 --- a/package.json +++ b/package.json @@ -188,35 +188,35 @@ }, "private": true, "scripts": { - "api.update": "tsm scripts/index.ts --tsc --api --dev", - "build": "tsm scripts/index.ts", + "api.update": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --tsc --api --dev", + "build": "node --loader ts-node/esm --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": "node --loader ts-node/esm scripts/index.ts --cli --dev", - "build.cli.prod": "node --loader ts-node/esm scripts/index.ts --cli", - "build.core": "node --loader ts-node/esm scripts/index.ts --tsc --build --qwikcity --api --platform-binding", - "build.eslint": "node --loader ts-node/esm scripts/index.ts --eslint", - "build.full": "node --loader ts-node/esm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding --wasm", - "build.local": "node --loader ts-node/esm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding-wasm-copy", - "build.only_javascript": "node --loader ts-node/esm scripts/index.ts --tsc --build --api", + "build.cli": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --cli --dev", + "build.cli.prod": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --cli", + "build.core": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --qwikcity --api --platform-binding", + "build.eslint": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --eslint", + "build.full": "node --loader ts-node/esm --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": "node --loader ts-node/esm --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": "node --loader ts-node/esm --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": "node --loader ts-node/esm scripts/index.ts --platform-binding", - "build.platform.copy": "node --loader ts-node/esm scripts/index.ts --platform-binding-wasm-copy", - "build.qwik-city": "node --loader ts-node/esm scripts/index.ts --tsc --qwikcity", - "build.validate": "node --loader ts-node/esm scripts/index.ts --tsc --build --api --eslint --qwikcity --platform-binding --wasm --validate", - "build.vite": "node --loader ts-node/esm scripts/index.ts --tsc --build --api --qwikcity --eslint --platform-binding-wasm-copy", - "build.wasm": "node --loader ts-node/esm scripts/index.ts --wasm", - "build.watch": "node --loader ts-node/esm scripts/index.ts --build --qwikcity --watch --dev --platform-binding", + "build.platform": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --platform-binding", + "build.platform.copy": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --platform-binding-wasm-copy", + "build.qwik-city": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikcity", + "build.validate": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api --eslint --qwikcity --platform-binding --wasm --validate", + "build.vite": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api --qwikcity --eslint --platform-binding-wasm-copy", + "build.wasm": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --wasm", + "build.watch": "node --loader ts-node/esm --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 && node --loader ts-node/esm --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": "node --loader ts-node/esm scripts/validate-cli.ts", + "cli.validate": "node --loader ts-node/esm --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": "node --loader ts-node/esm scripts/docs_sync/index.ts && pnpm fmt", - "eslint.update": "node --loader ts-node/esm scripts/eslint-docs.ts", + "docs.sync": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/docs_sync/index.ts && pnpm fmt", + "eslint.update": "node --loader ts-node/esm --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", @@ -231,12 +231,12 @@ "preinstall": "npx only-allow pnpm", "prepare": "simple-git-hooks", "prettier.fix": "prettier --cache --write .", - "qwik-save-artifacts": "node --loader ts-node/esm ./scripts/qwik-save-artifacts.ts", + "qwik-save-artifacts": "node --loader ts-node/esm --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": "node --loader ts-node/esm --inspect --conditions=development starters/dev-server.ts 3300", - "serve.debug": "node --loader ts-node/esm --inspect-brk --conditions=development starters/dev-server.ts 3300", + "serve": "node --loader ts-node/esm --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3300", + "serve.debug": "node --loader ts-node/esm --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", @@ -253,7 +253,7 @@ "tsc.check": "tsc --noEmit", "tsc.trace": "tsc -p tsconfig.json --traceResolution > tsc.log", "tsc.watch": "tsc --noEmit --watch --preserveWatchOutput", - "update.qwik.builds": "node --loader ts-node/esm scripts/update-qwik-builds.ts packages/docs && node --loader ts-node/esm scripts/update-qwik-builds.ts packages/insights; pnpm install", + "update.qwik.builds": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/update-qwik-builds.ts packages/docs && node --loader ts-node/esm scripts/update-qwik-builds.ts packages/insights; pnpm install", "vitest": "vitest" }, "simple-git-hooks": { diff --git a/packages/qwik/src/optimizer/src/qwik-binding-map.ts b/packages/qwik/src/optimizer/src/qwik-binding-map.ts index cceeb273668..6fd723f7147 100644 --- a/packages/qwik/src/optimizer/src/qwik-binding-map.ts +++ b/packages/qwik/src/optimizer/src/qwik-binding-map.ts @@ -4,14 +4,6 @@ // prettier-ignore export const QWIK_BINDING_MAP = { "darwin": { - "arm64": [ - { - "platform": "darwin", - "arch": "arm64", - "abi": null, - "platformArchABI": "qwik.darwin-arm64.node" - } - ], "x64": [ { "platform": "darwin", @@ -20,25 +12,5 @@ export const QWIK_BINDING_MAP = { "platformArchABI": "qwik.darwin-x64.node" } ] - }, - "win32": { - "x64": [ - { - "platform": "win32", - "arch": "x64", - "abi": "msvc", - "platformArchABI": "qwik.win32-x64-msvc.node" - } - ] - }, - "linux": { - "x64": [ - { - "platform": "linux", - "arch": "x64", - "abi": "gnu", - "platformArchABI": "qwik.linux-x64-gnu.node" - } - ] } }; diff --git a/scripts/index.ts b/scripts/index.ts index a2667ff0f19..b087aef9090 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -5,7 +5,6 @@ */ import { build } from './build'; import { loadConfig } from './util'; -import { polyfill } from './runBefore'; const args = process.argv.slice(2); @@ -14,6 +13,5 @@ const args = process.argv.slice(2); const config = loadConfig(args); config.esmNode = true; -polyfill(); // let's do this! build(config); diff --git a/scripts/runBefore.ts b/scripts/runBefore.ts index f54be467393..757304700a2 100644 --- a/scripts/runBefore.ts +++ b/scripts/runBefore.ts @@ -1,14 +1,11 @@ -declare global { - var qTest: boolean; - var qRuntimeQrl: boolean; - var qDev: boolean; - var qInspector: boolean; -} - -export function polyfill() { +function polyfill() { + // @ts-ignore globalThis.qTest = true; + // @ts-ignore globalThis.qRuntimeQrl = true; + // @ts-ignore globalThis.qDev = true; + // @ts-ignore globalThis.qInspector = false; if ( typeof global !== 'undefined' && @@ -26,3 +23,5 @@ export function polyfill() { } } } + +polyfill(); From 961773e38224bc45eb2e47f7b652a027b3fa8bc2 Mon Sep 17 00:00:00 2001 From: wuls Date: Thu, 19 Sep 2024 10:26:48 +0800 Subject: [PATCH 04/14] feat: ts-node --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cf22425b4ab..49425f83ad8 100644 --- a/package.json +++ b/package.json @@ -156,9 +156,9 @@ "svgo": "3.3.2", "syncpack": "12.3.3", "terser": "5.31.3", - "ts-node": "^10.9.2", "tmp": "0.2.3", "tree-kill": "1.2.2", + "ts-node": "^10.9.2", "typescript": "5.4.5", "undici": "*", "vfile": "6.0.1", @@ -241,8 +241,8 @@ "serve.debug": "node --loader ts-node/esm --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-cli": "pnpm --filter qwik-cli-e2e e2e", "test.e2e": "pnpm test.e2e.chromium && pnpm test.e2e.webkit", + "test.e2e-cli": "pnpm --filter qwik-cli-e2e e2e", "test.e2e.chromium": "playwright test starters --browser=chromium --config starters/playwright.config.ts", "test.e2e.chromium.debug": "PWDEBUG=1 playwright test starters --browser=chromium --config starters/playwright.config.ts", "test.e2e.city": "playwright test starters/e2e/qwikcity --browser=chromium --config starters/playwright.config.ts", From 447894cee08a0940a942189e94de8babc10e89c7 Mon Sep 17 00:00:00 2001 From: wuls Date: Thu, 19 Sep 2024 10:35:01 +0800 Subject: [PATCH 05/14] feat: ts-node --- starters/playwright.config.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/starters/playwright.config.ts b/starters/playwright.config.ts index 95c9525c263..449a809de75 100644 --- a/starters/playwright.config.ts +++ b/starters/playwright.config.ts @@ -28,7 +28,8 @@ const config: PlaywrightTestConfig = { retries: inGithubCI ? 0 : 1, expect: { timeout: inGithubCI ? 120000 : 10000 }, webServer: { - command: "pnpm tsm ./starters/dev-server.ts 3301", + command: + "pnpm node --loader ts-node/esm --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3301", port: 3301, reuseExistingServer: !process.env.CI, }, From 832e77b8ce30c0900875576b3a640c7e8bf0ec24 Mon Sep 17 00:00:00 2001 From: Jerry_wu <409187100@qq.com> Date: Thu, 19 Sep 2024 10:37:22 +0800 Subject: [PATCH 06/14] Update qwik-binding-map.ts --- .../src/optimizer/src/qwik-binding-map.ts | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/packages/qwik/src/optimizer/src/qwik-binding-map.ts b/packages/qwik/src/optimizer/src/qwik-binding-map.ts index 6fd723f7147..cceeb273668 100644 --- a/packages/qwik/src/optimizer/src/qwik-binding-map.ts +++ b/packages/qwik/src/optimizer/src/qwik-binding-map.ts @@ -4,6 +4,14 @@ // prettier-ignore export const QWIK_BINDING_MAP = { "darwin": { + "arm64": [ + { + "platform": "darwin", + "arch": "arm64", + "abi": null, + "platformArchABI": "qwik.darwin-arm64.node" + } + ], "x64": [ { "platform": "darwin", @@ -12,5 +20,25 @@ export const QWIK_BINDING_MAP = { "platformArchABI": "qwik.darwin-x64.node" } ] + }, + "win32": { + "x64": [ + { + "platform": "win32", + "arch": "x64", + "abi": "msvc", + "platformArchABI": "qwik.win32-x64-msvc.node" + } + ] + }, + "linux": { + "x64": [ + { + "platform": "linux", + "arch": "x64", + "abi": "gnu", + "platformArchABI": "qwik.linux-x64-gnu.node" + } + ] } }; From 4377c65a96a31a60b01bbe9656c5356f6dfc9602 Mon Sep 17 00:00:00 2001 From: JerryWu <409187100@qq.com> Date: Fri, 4 Oct 2024 21:37:26 +0800 Subject: [PATCH 07/14] fix version --- package.json | 8 ++++---- pnpm-lock.yaml | 12 ++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 49425f83ad8..c52d8658ef6 100644 --- a/package.json +++ b/package.json @@ -110,8 +110,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", + "@swc/core": "1.7.25", + "@swc/helpers": "0.5.13", "@types/brotli": "1.3.4", "@types/bun": "1.1.6", "@types/cross-spawn": "6.0.6", @@ -147,7 +147,7 @@ "prettier-plugin-jsdoc": "1.3.0", "pretty-quick": "4.0.0", "prompts": "2.4.2", - "regenerator-runtime": "^0.14.1", + "regenerator-runtime": "0.14.1", "rollup": "4.19.0", "semver": "7.6.3", "simple-git-hooks": "2.11.1", @@ -158,7 +158,7 @@ "terser": "5.31.3", "tmp": "0.2.3", "tree-kill": "1.2.2", - "ts-node": "^10.9.2", + "ts-node": "10.9.2", "typescript": "5.4.5", "undici": "*", "vfile": "6.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ce07d103be..7995cf14ec5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,10 +71,10 @@ importers: specifier: 1.40.0 version: 1.40.0 '@swc/core': - specifier: ^1.7.25 + specifier: 1.7.25 version: 1.7.25(@swc/helpers@0.5.13) '@swc/helpers': - specifier: ^0.5.13 + specifier: 0.5.13 version: 0.5.13 '@types/brotli': specifier: 1.3.4 @@ -182,7 +182,7 @@ importers: specifier: 2.4.2 version: 2.4.2 regenerator-runtime: - specifier: ^0.14.1 + specifier: 0.14.1 version: 0.14.1 rollup: specifier: 4.19.0 @@ -215,7 +215,7 @@ importers: specifier: 1.2.2 version: 1.2.2 ts-node: - specifier: ^10.9.2 + specifier: 10.9.2 version: 10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5) typescript: specifier: 5.4.5 @@ -3205,28 +3205,24 @@ packages: engines: {node: '>=10'} cpu: [arm64] os: [linux] - libc: [glibc] '@swc/core-linux-arm64-musl@1.7.25': resolution: {integrity: sha512-+/I7AzzY4066bvKLTyAZXLL0dPpWhRUh0ja4cZNZ+0Gpn8FmtWDwZKCriIWkDlD1gSuXm8+iOaaLGhEwIquOpQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] - libc: [musl] '@swc/core-linux-x64-gnu@1.7.25': resolution: {integrity: sha512-BPtnKyiBVMZyN6ml7oHGX9wuSLHN06nT1x1TM9wcSKSx6y+BEKb8jSmzrKzM7K5LnfOiy4+ARCb4HrMkXIQjUg==} engines: {node: '>=10'} cpu: [x64] os: [linux] - libc: [glibc] '@swc/core-linux-x64-musl@1.7.25': resolution: {integrity: sha512-ZlZztuvy2hvfoYg5gYHYuc2mssgzGq1kKanF9kPdICsTmze6t7AvkSfmlTN7/YGuO//yDDJR1GR0EuXwOAJqPw==} engines: {node: '>=10'} cpu: [x64] os: [linux] - libc: [musl] '@swc/core-win32-arm64-msvc@1.7.25': resolution: {integrity: sha512-k3QsHJ+53BVhRUeC7NJOMxdMGexBIhFmL8Ex39vqWVvDZgnOepMFu9/G1pm04xBHSqcb0lioDj5WirAoy4VusQ==} From 87fc242237f5391fe2708ddf17536c0ebfc609df Mon Sep 17 00:00:00 2001 From: wuls Date: Mon, 14 Oct 2024 14:21:44 +0800 Subject: [PATCH 08/14] test --- package.json | 50 +++++++++++++++++------------------ pnpm-lock.yaml | 6 +++++ starters/playwright.config.ts | 2 +- tsconfig.json | 10 ------- 4 files changed, 32 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index c52d8658ef6..a4c44208468 100644 --- a/package.json +++ b/package.json @@ -161,7 +161,7 @@ "ts-node": "10.9.2", "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", @@ -190,35 +190,35 @@ }, "private": true, "scripts": { - "api.update": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --tsc --api --dev", - "build": "node --loader ts-node/esm --require ./scripts/runBefore.ts 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": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --cli --dev", - "build.cli.prod": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --cli", - "build.core": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --qwikcity --api --platform-binding", - "build.eslint": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --eslint", - "build.full": "node --loader ts-node/esm --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": "node --loader ts-node/esm --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": "node --loader ts-node/esm --require ./scripts/runBefore.ts 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": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --platform-binding", - "build.platform.copy": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --platform-binding-wasm-copy", - "build.qwik-city": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikcity", - "build.validate": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api --eslint --qwikcity --platform-binding --wasm --validate", - "build.vite": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api --qwikcity --eslint --platform-binding-wasm-copy", - "build.wasm": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/index.ts --wasm", - "build.watch": "node --loader ts-node/esm --require ./scripts/runBefore.ts 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 && node --loader ts-node/esm --require ./scripts/runBefore.ts 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": "node --loader ts-node/esm --require ./scripts/runBefore.ts 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": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/docs_sync/index.ts && pnpm fmt", - "eslint.update": "node --loader ts-node/esm --require ./scripts/runBefore.ts 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", @@ -233,12 +233,12 @@ "preinstall": "npx only-allow pnpm", "prepare": "simple-git-hooks", "prettier.fix": "prettier --cache --write .", - "qwik-save-artifacts": "node --loader ts-node/esm --require ./scripts/runBefore.ts ./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": "node --loader ts-node/esm --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3300", - "serve.debug": "node --loader ts-node/esm --require ./scripts/runBefore.ts --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", @@ -256,7 +256,7 @@ "tsc.check": "tsc --noEmit", "tsc.trace": "tsc -p tsconfig.json --traceResolution > tsc.log", "tsc.watch": "tsc --noEmit --watch --preserveWatchOutput", - "update.qwik.builds": "node --loader ts-node/esm --require ./scripts/runBefore.ts scripts/update-qwik-builds.ts packages/docs && node --loader ts-node/esm 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": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 89de695529e..f662cba256c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2959,6 +2959,7 @@ packages: '@playwright/test@1.40.0': resolution: {integrity: sha512-PdW+kn4eV99iP5gxWNSDQCbhMaDVej+RXL5xr6t04nbKLCBwYtA046t7ofoczHOm8u6c+45hpDKQVZqtqwkeQg==} engines: {node: '>=16'} + deprecated: Please update to the latest version of Playwright to test up-to-date browsers. hasBin: true '@pnpm/config.env-replace@1.1.0': @@ -3211,24 +3212,28 @@ packages: engines: {node: '>=10'} cpu: [arm64] os: [linux] + libc: [glibc] '@swc/core-linux-arm64-musl@1.7.25': resolution: {integrity: sha512-+/I7AzzY4066bvKLTyAZXLL0dPpWhRUh0ja4cZNZ+0Gpn8FmtWDwZKCriIWkDlD1gSuXm8+iOaaLGhEwIquOpQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] + libc: [musl] '@swc/core-linux-x64-gnu@1.7.25': resolution: {integrity: sha512-BPtnKyiBVMZyN6ml7oHGX9wuSLHN06nT1x1TM9wcSKSx6y+BEKb8jSmzrKzM7K5LnfOiy4+ARCb4HrMkXIQjUg==} engines: {node: '>=10'} cpu: [x64] os: [linux] + libc: [glibc] '@swc/core-linux-x64-musl@1.7.25': resolution: {integrity: sha512-ZlZztuvy2hvfoYg5gYHYuc2mssgzGq1kKanF9kPdICsTmze6t7AvkSfmlTN7/YGuO//yDDJR1GR0EuXwOAJqPw==} engines: {node: '>=10'} cpu: [x64] os: [linux] + libc: [musl] '@swc/core-win32-arm64-msvc@1.7.25': resolution: {integrity: sha512-k3QsHJ+53BVhRUeC7NJOMxdMGexBIhFmL8Ex39vqWVvDZgnOepMFu9/G1pm04xBHSqcb0lioDj5WirAoy4VusQ==} @@ -5281,6 +5286,7 @@ packages: eslint@8.57.0: resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options. hasBin: true esniff@2.0.1: diff --git a/starters/playwright.config.ts b/starters/playwright.config.ts index 449a809de75..8e70ab77920 100644 --- a/starters/playwright.config.ts +++ b/starters/playwright.config.ts @@ -29,7 +29,7 @@ const config: PlaywrightTestConfig = { expect: { timeout: inGithubCI ? 120000 : 10000 }, webServer: { command: - "pnpm node --loader ts-node/esm --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3301", + "pnpm tsx --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3301", port: 3301, reuseExistingServer: !process.env.CI, }, diff --git a/tsconfig.json b/tsconfig.json index 5ba91b0015d..bb7e1c84ac0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -40,16 +40,6 @@ "forceConsistentCasingInFileNames": true, "rootDir": "." }, - "ts-node": { - "experimentalSpecifierResolution": "node", - "transpileOnly": true, - "esm": true, - "swc": true, - "compilerOptions": { - "jsxFactory": "qwikJsx.h", - "jsxFragmentFactory": "qwikJsx.Fragment" - } - }, "include": [ "packages/create-qwik", "packages/qwik-auth", From d1ad0909960fe72e84195293940b996d02f443f5 Mon Sep 17 00:00:00 2001 From: wuls Date: Mon, 14 Oct 2024 14:32:29 +0800 Subject: [PATCH 09/14] test --- package.json | 3 +- pnpm-lock.yaml | 271 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 273 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a4c44208468..aa3c68934b1 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,8 @@ } ], "dependencies": { - "esbuild-plugin-raw": "^0.1.8" + "esbuild-plugin-raw": "^0.1.8", + "tsx": "4.19.1" }, "devDependencies": { "@builder.io/partytown": "0.10.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f662cba256c..68c2b2e4144 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,6 +21,9 @@ importers: esbuild-plugin-raw: specifier: ^0.1.8 version: 0.1.8(esbuild@0.20.2) + tsx: + specifier: ^4.19.1 + version: 4.19.1 devDependencies: '@builder.io/partytown': specifier: 0.10.2 @@ -1221,6 +1224,12 @@ packages: cpu: [ppc64] os: [aix] + '@esbuild/aix-ppc64@0.23.1': + resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [aix] + '@esbuild/android-arm64@0.17.19': resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==} engines: {node: '>=12'} @@ -1263,6 +1272,12 @@ packages: cpu: [arm64] os: [android] + '@esbuild/android-arm64@0.23.1': + resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==} + engines: {node: '>=18'} + cpu: [arm64] + os: [android] + '@esbuild/android-arm@0.15.18': resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==} engines: {node: '>=12'} @@ -1311,6 +1326,12 @@ packages: cpu: [arm] os: [android] + '@esbuild/android-arm@0.23.1': + resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==} + engines: {node: '>=18'} + cpu: [arm] + os: [android] + '@esbuild/android-x64@0.17.19': resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==} engines: {node: '>=12'} @@ -1353,6 +1374,12 @@ packages: cpu: [x64] os: [android] + '@esbuild/android-x64@0.23.1': + resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==} + engines: {node: '>=18'} + cpu: [x64] + os: [android] + '@esbuild/darwin-arm64@0.17.19': resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==} engines: {node: '>=12'} @@ -1395,6 +1422,12 @@ packages: cpu: [arm64] os: [darwin] + '@esbuild/darwin-arm64@0.23.1': + resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==} + engines: {node: '>=18'} + cpu: [arm64] + os: [darwin] + '@esbuild/darwin-x64@0.17.19': resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==} engines: {node: '>=12'} @@ -1437,6 +1470,12 @@ packages: cpu: [x64] os: [darwin] + '@esbuild/darwin-x64@0.23.1': + resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==} + engines: {node: '>=18'} + cpu: [x64] + os: [darwin] + '@esbuild/freebsd-arm64@0.17.19': resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==} engines: {node: '>=12'} @@ -1479,6 +1518,12 @@ packages: cpu: [arm64] os: [freebsd] + '@esbuild/freebsd-arm64@0.23.1': + resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==} + engines: {node: '>=18'} + cpu: [arm64] + os: [freebsd] + '@esbuild/freebsd-x64@0.17.19': resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==} engines: {node: '>=12'} @@ -1521,6 +1566,12 @@ packages: cpu: [x64] os: [freebsd] + '@esbuild/freebsd-x64@0.23.1': + resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==} + engines: {node: '>=18'} + cpu: [x64] + os: [freebsd] + '@esbuild/linux-arm64@0.17.19': resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==} engines: {node: '>=12'} @@ -1563,6 +1614,12 @@ packages: cpu: [arm64] os: [linux] + '@esbuild/linux-arm64@0.23.1': + resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==} + engines: {node: '>=18'} + cpu: [arm64] + os: [linux] + '@esbuild/linux-arm@0.17.19': resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==} engines: {node: '>=12'} @@ -1605,6 +1662,12 @@ packages: cpu: [arm] os: [linux] + '@esbuild/linux-arm@0.23.1': + resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==} + engines: {node: '>=18'} + cpu: [arm] + os: [linux] + '@esbuild/linux-ia32@0.17.19': resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==} engines: {node: '>=12'} @@ -1647,6 +1710,12 @@ packages: cpu: [ia32] os: [linux] + '@esbuild/linux-ia32@0.23.1': + resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==} + engines: {node: '>=18'} + cpu: [ia32] + os: [linux] + '@esbuild/linux-loong64@0.15.18': resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==} engines: {node: '>=12'} @@ -1695,6 +1764,12 @@ packages: cpu: [loong64] os: [linux] + '@esbuild/linux-loong64@0.23.1': + resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==} + engines: {node: '>=18'} + cpu: [loong64] + os: [linux] + '@esbuild/linux-mips64el@0.17.19': resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==} engines: {node: '>=12'} @@ -1737,6 +1812,12 @@ packages: cpu: [mips64el] os: [linux] + '@esbuild/linux-mips64el@0.23.1': + resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==} + engines: {node: '>=18'} + cpu: [mips64el] + os: [linux] + '@esbuild/linux-ppc64@0.17.19': resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==} engines: {node: '>=12'} @@ -1779,6 +1860,12 @@ packages: cpu: [ppc64] os: [linux] + '@esbuild/linux-ppc64@0.23.1': + resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [linux] + '@esbuild/linux-riscv64@0.17.19': resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==} engines: {node: '>=12'} @@ -1821,6 +1908,12 @@ packages: cpu: [riscv64] os: [linux] + '@esbuild/linux-riscv64@0.23.1': + resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==} + engines: {node: '>=18'} + cpu: [riscv64] + os: [linux] + '@esbuild/linux-s390x@0.17.19': resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==} engines: {node: '>=12'} @@ -1863,6 +1956,12 @@ packages: cpu: [s390x] os: [linux] + '@esbuild/linux-s390x@0.23.1': + resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==} + engines: {node: '>=18'} + cpu: [s390x] + os: [linux] + '@esbuild/linux-x64@0.17.19': resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==} engines: {node: '>=12'} @@ -1905,6 +2004,12 @@ packages: cpu: [x64] os: [linux] + '@esbuild/linux-x64@0.23.1': + resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==} + engines: {node: '>=18'} + cpu: [x64] + os: [linux] + '@esbuild/netbsd-x64@0.17.19': resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==} engines: {node: '>=12'} @@ -1947,6 +2052,18 @@ packages: cpu: [x64] os: [netbsd] + '@esbuild/netbsd-x64@0.23.1': + resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==} + engines: {node: '>=18'} + cpu: [x64] + os: [netbsd] + + '@esbuild/openbsd-arm64@0.23.1': + resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openbsd] + '@esbuild/openbsd-x64@0.17.19': resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==} engines: {node: '>=12'} @@ -1989,6 +2106,12 @@ packages: cpu: [x64] os: [openbsd] + '@esbuild/openbsd-x64@0.23.1': + resolution: {integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==} + engines: {node: '>=18'} + cpu: [x64] + os: [openbsd] + '@esbuild/sunos-x64@0.17.19': resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==} engines: {node: '>=12'} @@ -2031,6 +2154,12 @@ packages: cpu: [x64] os: [sunos] + '@esbuild/sunos-x64@0.23.1': + resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==} + engines: {node: '>=18'} + cpu: [x64] + os: [sunos] + '@esbuild/win32-arm64@0.17.19': resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==} engines: {node: '>=12'} @@ -2073,6 +2202,12 @@ packages: cpu: [arm64] os: [win32] + '@esbuild/win32-arm64@0.23.1': + resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==} + engines: {node: '>=18'} + cpu: [arm64] + os: [win32] + '@esbuild/win32-ia32@0.17.19': resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==} engines: {node: '>=12'} @@ -2115,6 +2250,12 @@ packages: cpu: [ia32] os: [win32] + '@esbuild/win32-ia32@0.23.1': + resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==} + engines: {node: '>=18'} + cpu: [ia32] + os: [win32] + '@esbuild/win32-x64@0.17.19': resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==} engines: {node: '>=12'} @@ -2157,6 +2298,12 @@ packages: cpu: [x64] os: [win32] + '@esbuild/win32-x64@0.23.1': + resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==} + engines: {node: '>=18'} + cpu: [x64] + os: [win32] + '@eslint-community/eslint-utils@4.4.0': resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -5239,6 +5386,11 @@ packages: engines: {node: '>=12'} hasBin: true + esbuild@0.23.1: + resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==} + engines: {node: '>=18'} + hasBin: true + escalade@3.1.2: resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} engines: {node: '>=6'} @@ -5789,6 +5941,9 @@ packages: get-tsconfig@4.7.2: resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==} + get-tsconfig@4.8.1: + resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==} + get-uri@6.0.3: resolution: {integrity: sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==} engines: {node: '>= 14'} @@ -6693,6 +6848,7 @@ packages: libsql@0.3.18: resolution: {integrity: sha512-lvhKr7WV3NLWRbXkjn/MeKqXOAqWKU0PX9QYrvDh7fneukapj+iUQ4qgJASrQyxcCrEsClXCQiiK5W6OoYPAlA==} + cpu: [x64, arm64, wasm32] os: [darwin, linux, win32] light-my-request@5.11.1: @@ -9212,6 +9368,11 @@ packages: peerDependencies: typescript: 5.4.5 + tsx@4.19.1: + resolution: {integrity: sha512-0flMz1lh74BR4wOvBjuh9olbnwqCPc35OOlfyzHba0Dc+QNUeWX/Gq2YTbnwcWPO3BMd8fkzRVrHcsR+a7z7rA==} + engines: {node: '>=18.0.0'} + hasBin: true + tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} @@ -10487,6 +10648,9 @@ snapshots: '@esbuild/aix-ppc64@0.21.5': optional: true + '@esbuild/aix-ppc64@0.23.1': + optional: true + '@esbuild/android-arm64@0.17.19': optional: true @@ -10508,6 +10672,9 @@ snapshots: '@esbuild/android-arm64@0.21.5': optional: true + '@esbuild/android-arm64@0.23.1': + optional: true + '@esbuild/android-arm@0.15.18': optional: true @@ -10532,6 +10699,9 @@ snapshots: '@esbuild/android-arm@0.21.5': optional: true + '@esbuild/android-arm@0.23.1': + optional: true + '@esbuild/android-x64@0.17.19': optional: true @@ -10553,6 +10723,9 @@ snapshots: '@esbuild/android-x64@0.21.5': optional: true + '@esbuild/android-x64@0.23.1': + optional: true + '@esbuild/darwin-arm64@0.17.19': optional: true @@ -10574,6 +10747,9 @@ snapshots: '@esbuild/darwin-arm64@0.21.5': optional: true + '@esbuild/darwin-arm64@0.23.1': + optional: true + '@esbuild/darwin-x64@0.17.19': optional: true @@ -10595,6 +10771,9 @@ snapshots: '@esbuild/darwin-x64@0.21.5': optional: true + '@esbuild/darwin-x64@0.23.1': + optional: true + '@esbuild/freebsd-arm64@0.17.19': optional: true @@ -10616,6 +10795,9 @@ snapshots: '@esbuild/freebsd-arm64@0.21.5': optional: true + '@esbuild/freebsd-arm64@0.23.1': + optional: true + '@esbuild/freebsd-x64@0.17.19': optional: true @@ -10637,6 +10819,9 @@ snapshots: '@esbuild/freebsd-x64@0.21.5': optional: true + '@esbuild/freebsd-x64@0.23.1': + optional: true + '@esbuild/linux-arm64@0.17.19': optional: true @@ -10658,6 +10843,9 @@ snapshots: '@esbuild/linux-arm64@0.21.5': optional: true + '@esbuild/linux-arm64@0.23.1': + optional: true + '@esbuild/linux-arm@0.17.19': optional: true @@ -10679,6 +10867,9 @@ snapshots: '@esbuild/linux-arm@0.21.5': optional: true + '@esbuild/linux-arm@0.23.1': + optional: true + '@esbuild/linux-ia32@0.17.19': optional: true @@ -10700,6 +10891,9 @@ snapshots: '@esbuild/linux-ia32@0.21.5': optional: true + '@esbuild/linux-ia32@0.23.1': + optional: true + '@esbuild/linux-loong64@0.15.18': optional: true @@ -10724,6 +10918,9 @@ snapshots: '@esbuild/linux-loong64@0.21.5': optional: true + '@esbuild/linux-loong64@0.23.1': + optional: true + '@esbuild/linux-mips64el@0.17.19': optional: true @@ -10745,6 +10942,9 @@ snapshots: '@esbuild/linux-mips64el@0.21.5': optional: true + '@esbuild/linux-mips64el@0.23.1': + optional: true + '@esbuild/linux-ppc64@0.17.19': optional: true @@ -10766,6 +10966,9 @@ snapshots: '@esbuild/linux-ppc64@0.21.5': optional: true + '@esbuild/linux-ppc64@0.23.1': + optional: true + '@esbuild/linux-riscv64@0.17.19': optional: true @@ -10787,6 +10990,9 @@ snapshots: '@esbuild/linux-riscv64@0.21.5': optional: true + '@esbuild/linux-riscv64@0.23.1': + optional: true + '@esbuild/linux-s390x@0.17.19': optional: true @@ -10808,6 +11014,9 @@ snapshots: '@esbuild/linux-s390x@0.21.5': optional: true + '@esbuild/linux-s390x@0.23.1': + optional: true + '@esbuild/linux-x64@0.17.19': optional: true @@ -10829,6 +11038,9 @@ snapshots: '@esbuild/linux-x64@0.21.5': optional: true + '@esbuild/linux-x64@0.23.1': + optional: true + '@esbuild/netbsd-x64@0.17.19': optional: true @@ -10850,6 +11062,12 @@ snapshots: '@esbuild/netbsd-x64@0.21.5': optional: true + '@esbuild/netbsd-x64@0.23.1': + optional: true + + '@esbuild/openbsd-arm64@0.23.1': + optional: true + '@esbuild/openbsd-x64@0.17.19': optional: true @@ -10871,6 +11089,9 @@ snapshots: '@esbuild/openbsd-x64@0.21.5': optional: true + '@esbuild/openbsd-x64@0.23.1': + optional: true + '@esbuild/sunos-x64@0.17.19': optional: true @@ -10892,6 +11113,9 @@ snapshots: '@esbuild/sunos-x64@0.21.5': optional: true + '@esbuild/sunos-x64@0.23.1': + optional: true + '@esbuild/win32-arm64@0.17.19': optional: true @@ -10913,6 +11137,9 @@ snapshots: '@esbuild/win32-arm64@0.21.5': optional: true + '@esbuild/win32-arm64@0.23.1': + optional: true + '@esbuild/win32-ia32@0.17.19': optional: true @@ -10934,6 +11161,9 @@ snapshots: '@esbuild/win32-ia32@0.21.5': optional: true + '@esbuild/win32-ia32@0.23.1': + optional: true + '@esbuild/win32-x64@0.17.19': optional: true @@ -10955,6 +11185,9 @@ snapshots: '@esbuild/win32-x64@0.21.5': optional: true + '@esbuild/win32-x64@0.23.1': + optional: true + '@eslint-community/eslint-utils@4.4.0(eslint@8.57.0)': dependencies: eslint: 8.57.0 @@ -14527,6 +14760,33 @@ snapshots: '@esbuild/win32-ia32': 0.21.5 '@esbuild/win32-x64': 0.21.5 + esbuild@0.23.1: + optionalDependencies: + '@esbuild/aix-ppc64': 0.23.1 + '@esbuild/android-arm': 0.23.1 + '@esbuild/android-arm64': 0.23.1 + '@esbuild/android-x64': 0.23.1 + '@esbuild/darwin-arm64': 0.23.1 + '@esbuild/darwin-x64': 0.23.1 + '@esbuild/freebsd-arm64': 0.23.1 + '@esbuild/freebsd-x64': 0.23.1 + '@esbuild/linux-arm': 0.23.1 + '@esbuild/linux-arm64': 0.23.1 + '@esbuild/linux-ia32': 0.23.1 + '@esbuild/linux-loong64': 0.23.1 + '@esbuild/linux-mips64el': 0.23.1 + '@esbuild/linux-ppc64': 0.23.1 + '@esbuild/linux-riscv64': 0.23.1 + '@esbuild/linux-s390x': 0.23.1 + '@esbuild/linux-x64': 0.23.1 + '@esbuild/netbsd-x64': 0.23.1 + '@esbuild/openbsd-arm64': 0.23.1 + '@esbuild/openbsd-x64': 0.23.1 + '@esbuild/sunos-x64': 0.23.1 + '@esbuild/win32-arm64': 0.23.1 + '@esbuild/win32-ia32': 0.23.1 + '@esbuild/win32-x64': 0.23.1 + escalade@3.1.2: {} escape-goat@4.0.0: {} @@ -15219,6 +15479,10 @@ snapshots: dependencies: resolve-pkg-maps: 1.0.0 + get-tsconfig@4.8.1: + dependencies: + resolve-pkg-maps: 1.0.0 + get-uri@6.0.3: dependencies: basic-ftp: 5.0.4 @@ -19358,6 +19622,13 @@ snapshots: tslib: 1.14.1 typescript: 5.4.5 + tsx@4.19.1: + dependencies: + esbuild: 0.23.1 + get-tsconfig: 4.8.1 + optionalDependencies: + fsevents: 2.3.3 + tunnel-agent@0.6.0: dependencies: safe-buffer: 5.2.1 From 66f5625dd4809259ce4f03e2858c815a6796222b Mon Sep 17 00:00:00 2001 From: wuls Date: Mon, 14 Oct 2024 14:36:22 +0800 Subject: [PATCH 10/14] test --- pnpm-lock.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 68c2b2e4144..2bc010527d0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: specifier: ^0.1.8 version: 0.1.8(esbuild@0.20.2) tsx: - specifier: ^4.19.1 + specifier: 4.19.1 version: 4.19.1 devDependencies: '@builder.io/partytown': @@ -5938,9 +5938,6 @@ packages: resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==} engines: {node: '>= 0.4'} - get-tsconfig@4.7.2: - resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==} - get-tsconfig@4.8.1: resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==} @@ -6848,7 +6845,6 @@ packages: libsql@0.3.18: resolution: {integrity: sha512-lvhKr7WV3NLWRbXkjn/MeKqXOAqWKU0PX9QYrvDh7fneukapj+iUQ4qgJASrQyxcCrEsClXCQiiK5W6OoYPAlA==} - cpu: [x64, arm64, wasm32] os: [darwin, linux, win32] light-my-request@5.11.1: @@ -10621,7 +10617,7 @@ snapshots: '@esbuild-kit/esm-loader@2.6.5': dependencies: '@esbuild-kit/core-utils': 3.3.2 - get-tsconfig: 4.7.2 + get-tsconfig: 4.8.1 '@esbuild-plugins/node-globals-polyfill@0.2.3(esbuild@0.17.19)': dependencies: @@ -15475,10 +15471,6 @@ snapshots: es-errors: 1.3.0 get-intrinsic: 1.2.4 - get-tsconfig@4.7.2: - dependencies: - resolve-pkg-maps: 1.0.0 - get-tsconfig@4.8.1: dependencies: resolve-pkg-maps: 1.0.0 From b322ebd1b3704104e522136cdffc42e2070c6b00 Mon Sep 17 00:00:00 2001 From: wuls Date: Mon, 14 Oct 2024 14:39:55 +0800 Subject: [PATCH 11/14] test --- package.json | 2 +- packages/qwik-city/package.json | 2 +- pnpm-lock.yaml | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index aa3c68934b1..fc66fdb9abe 100644 --- a/package.json +++ b/package.json @@ -182,7 +182,7 @@ "pnpm": { "overrides": { "typescript": "5.4.5", - "vfile": "6.0.1", + "vfile": "6.0.2", "@supabase/realtime-js": "2.8.4" }, "patchedDependencies": { diff --git a/packages/qwik-city/package.json b/packages/qwik-city/package.json index 2c487321dde..65da19ef6dd 100644 --- a/packages/qwik-city/package.json +++ b/packages/qwik-city/package.json @@ -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" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2bc010527d0..ccd0af8932e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ settings: overrides: typescript: 5.4.5 - vfile: 6.0.1 + vfile: 6.0.2 '@supabase/realtime-js': 2.8.4 patchedDependencies: @@ -227,8 +227,8 @@ importers: specifier: '*' version: 6.6.2 vfile: - specifier: 6.0.1 - version: 6.0.1 + specifier: 6.0.2 + version: 6.0.2 vite: specifier: 5.3.5 version: 5.3.5(@types/node@20.14.11)(terser@5.31.3) @@ -627,8 +627,8 @@ importers: specifier: '>=0.36.0 <2' version: 0.39.0(typescript@5.4.5) vfile: - specifier: 6.0.1 - version: 6.0.1 + specifier: 6.0.2 + version: 6.0.2 vite: specifier: ^5 version: 5.3.5(@types/node@20.14.11)(terser@5.31.3) @@ -9667,8 +9667,8 @@ packages: vfile-message@4.0.2: resolution: {integrity: sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==} - vfile@6.0.1: - resolution: {integrity: sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==} + vfile@6.0.2: + resolution: {integrity: sha512-zND7NlS8rJYb/sPqkb13ZvbbUoExdbi4w3SfRrMq6R3FvnLQmmfpajJNITuuYm6AZ5uao9vy4BAos3EXBPf2rg==} vite-imagetools@7.0.4: resolution: {integrity: sha512-C9C7b2p/8/TCN2g26tE9haoer2i8K4x0v2RXUiHsIjiz221vQuKItCQ+VyiVCsUMPXfJC/tlZsmCZVBz5jh7uA==} @@ -11538,7 +11538,7 @@ snapshots: unist-util-position-from-estree: 2.0.0 unist-util-stringify-position: 4.0.0 unist-util-visit: 5.0.0 - vfile: 6.0.1 + vfile: 6.0.2 transitivePeerDependencies: - supports-color @@ -15691,7 +15691,7 @@ snapshots: devlop: 1.1.0 hast-util-from-parse5: 8.0.1 parse5: 7.1.2 - vfile: 6.0.1 + vfile: 6.0.2 vfile-message: 4.0.2 hast-util-from-parse5@8.0.1: @@ -15701,7 +15701,7 @@ snapshots: devlop: 1.1.0 hastscript: 8.0.0 property-information: 6.4.1 - vfile: 6.0.1 + vfile: 6.0.2 vfile-location: 5.0.2 web-namespaces: 2.0.1 @@ -16907,7 +16907,7 @@ snapshots: trim-lines: 3.0.1 unist-util-position: 5.0.0 unist-util-visit: 5.0.0 - vfile: 6.0.1 + vfile: 6.0.2 mdast-util-to-markdown@2.1.0: dependencies: @@ -18634,7 +18634,7 @@ snapshots: '@types/mdast': 4.0.4 mdast-util-to-hast: 13.1.0 unified: 11.0.5 - vfile: 6.0.1 + vfile: 6.0.2 remark-stringify@11.0.0: dependencies: @@ -19749,7 +19749,7 @@ snapshots: extend: 3.0.2 is-plain-obj: 4.1.0 trough: 2.2.0 - vfile: 6.0.1 + vfile: 6.0.2 unique-string@3.0.0: dependencies: @@ -19911,14 +19911,14 @@ snapshots: vfile-location@5.0.2: dependencies: '@types/unist': 3.0.2 - vfile: 6.0.1 + vfile: 6.0.2 vfile-message@4.0.2: dependencies: '@types/unist': 3.0.2 unist-util-stringify-position: 4.0.0 - vfile@6.0.1: + vfile@6.0.2: dependencies: '@types/unist': 3.0.2 unist-util-stringify-position: 4.0.0 From d38a11225a071bf8b0c261a3227ef239aec1c180 Mon Sep 17 00:00:00 2001 From: wuls Date: Tue, 15 Oct 2024 10:52:20 +0800 Subject: [PATCH 12/14] fix test --- package.json | 8 +- packages/docs/package.json | 8 +- packages/insights/package.json | 2 +- pnpm-lock.yaml | 183 +++------------------------------ starters/playwright.config.ts | 2 +- 5 files changed, 23 insertions(+), 180 deletions(-) diff --git a/package.json b/package.json index fc66fdb9abe..0918d02c058 100644 --- a/package.json +++ b/package.json @@ -91,8 +91,7 @@ } ], "dependencies": { - "esbuild-plugin-raw": "^0.1.8", - "tsx": "4.19.1" + "esbuild-plugin-raw": "^0.1.8" }, "devDependencies": { "@builder.io/partytown": "0.10.2", @@ -111,8 +110,6 @@ "@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", "@types/brotli": "1.3.4", "@types/bun": "1.1.6", "@types/cross-spawn": "6.0.6", @@ -148,7 +145,6 @@ "prettier-plugin-jsdoc": "1.3.0", "pretty-quick": "4.0.0", "prompts": "2.4.2", - "regenerator-runtime": "0.14.1", "rollup": "4.19.0", "semver": "7.6.3", "simple-git-hooks": "2.11.1", @@ -159,7 +155,7 @@ "terser": "5.31.3", "tmp": "0.2.3", "tree-kill": "1.2.2", - "ts-node": "10.9.2", + "tsx": "4.19.1", "typescript": "5.4.5", "undici": "*", "vfile": "6.0.2", diff --git a/packages/docs/package.json b/packages/docs/package.json index 1553a3546ed..991781fc063 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -73,12 +73,12 @@ "build.repl-sw": "vite --config vite.config-repl-sw.mts build", "build.server": "NODE_OPTIONS=--max-old-space-size=8192 vite build -c adapters/cloudflare-pages/vite.config.mts", "build.showcase": "pnpm node scripts/showcase.js", - "codesandbox.sync": "tsm codesandbox.sync.ts", - "contributors": "tsm contributors.ts", + "codesandbox.sync": "tsx codesandbox.sync.ts", + "contributors": "tsx contributors.ts", "deploy": "wrangler pages publish ./dist", - "dev": "tsm check-qwik-build.ts && vite --mode ssr --open", + "dev": "tsx check-qwik-build.ts && vite --mode ssr --open", "dev.debug": "node --inspect-brk ../../node_modules/vite/bin/vite.js --mode ssr --force", - "prebuild.core": "tsm check-qwik-build.ts", + "prebuild.core": "tsx check-qwik-build.ts", "preview": "qwik build preview && vite preview --open", "preview.only": "NODE_DEBUG=net,http node --inspect-brk ../../node_modules/vite/bin/vite.js preview", "preview.wrangler": "wrangler pages dev ./dist --compatibility-flags=nodejs_als", diff --git a/packages/insights/package.json b/packages/insights/package.json index 7f66b817bc2..f8fcc3b11dd 100644 --- a/packages/insights/package.json +++ b/packages/insights/package.json @@ -65,7 +65,7 @@ "qManifest.post.local": "curl -X POST -H 'Content-Type: application/json' -d @./dist/q-manifest.json http://localhost:5173/api/v1/221smyuj5gl/post/manifest/", "qwik": "qwik", "start": "vite --open --mode ssr", - "test.cluster": "tsm src/cluster.ts", + "test.cluster": "tsx src/cluster.ts", "test.unit": "vitest", "test.watch": "vitest --watch" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ccd0af8932e..38b5af71500 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,9 +21,6 @@ importers: esbuild-plugin-raw: specifier: ^0.1.8 version: 0.1.8(esbuild@0.20.2) - tsx: - specifier: 4.19.1 - version: 4.19.1 devDependencies: '@builder.io/partytown': specifier: 0.10.2 @@ -73,12 +70,6 @@ importers: '@playwright/test': specifier: 1.40.0 version: 1.40.0 - '@swc/core': - specifier: 1.7.25 - version: 1.7.25(@swc/helpers@0.5.13) - '@swc/helpers': - specifier: 0.5.13 - version: 0.5.13 '@types/brotli': specifier: 1.3.4 version: 1.3.4 @@ -184,9 +175,6 @@ importers: prompts: specifier: 2.4.2 version: 2.4.2 - regenerator-runtime: - specifier: 0.14.1 - version: 0.14.1 rollup: specifier: 4.19.0 version: 4.19.0 @@ -217,9 +205,9 @@ importers: tree-kill: specifier: 1.2.2 version: 1.2.2 - ts-node: - specifier: 10.9.2 - version: 10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5) + tsx: + specifier: 4.19.1 + version: 4.19.1 typescript: specifier: 5.4.5 version: 5.4.5 @@ -405,7 +393,7 @@ importers: version: 2.0.0 tailwindcss: specifier: 3.4.6 - version: 3.4.6(ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5)) + version: 3.4.6(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5)) terser: specifier: 5.31.3 version: 5.31.3 @@ -533,7 +521,7 @@ importers: version: link:../eslint-plugin-qwik netlify-cli: specifier: 17.33.4 - version: 17.33.4(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/express@4.17.21)(@types/node@20.14.11)(bufferutil@4.0.8)(picomatch@3.0.1)(utf-8-validate@5.0.10) + version: 17.33.4(@types/express@4.17.21)(@types/node@20.14.11)(bufferutil@4.0.8)(picomatch@3.0.1)(utf-8-validate@5.0.10) postcss: specifier: 8.4.39 version: 8.4.39 @@ -545,7 +533,7 @@ importers: version: 0.5.14(prettier-plugin-jsdoc@1.3.0(prettier@3.3.3))(prettier@3.3.3) tailwindcss: specifier: 3.4.6 - version: 3.4.6(ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5)) + version: 3.4.6(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5)) typescript: specifier: 5.4.5 version: 5.4.5 @@ -3336,88 +3324,6 @@ packages: '@supabase/supabase-js@2.44.4': resolution: {integrity: sha512-vqtUp8umqcgj+RPUc7LiEcQmgsEWFDPJdJizRJF/5tf2zSlVB+3YbUwyQE/hLagYA8TLvGXe7oAqtYyFde6llw==} - '@swc/core-darwin-arm64@1.7.25': - resolution: {integrity: sha512-cbLNV4vsqSbll7kehJ58hZ9lt+nLlUPF+fmSRVsb4Qasnr0IRDtpT+3Rc87bDNXfkc15Ii80xdp7sU2MVgHn7A==} - engines: {node: '>=10'} - cpu: [arm64] - os: [darwin] - - '@swc/core-darwin-x64@1.7.25': - resolution: {integrity: sha512-kZswLBI8KWWV8VuGIJZd8GM7eWFY5srmlomiWw7j/OtRyRgr8qfX3EmxBAYYZqTEvWdooSc/y3I61lHn/a1tRg==} - engines: {node: '>=10'} - cpu: [x64] - os: [darwin] - - '@swc/core-linux-arm-gnueabihf@1.7.25': - resolution: {integrity: sha512-DV/8BHwdtymoelC1KvefOoyXraIDK0rJIBqjPvtzW9YbkN1hepF7au1deiieJ6+A0smP+4fxtYhrnJ5EjPvylA==} - engines: {node: '>=10'} - cpu: [arm] - os: [linux] - - '@swc/core-linux-arm64-gnu@1.7.25': - resolution: {integrity: sha512-lIx8BeKzpulL2PbLyMUln5Hk164M/PHXquHt6y86sD7Spza6zbCme+/Zr17PRiElqrP8byKC09UZj0K6hONDqQ==} - engines: {node: '>=10'} - cpu: [arm64] - os: [linux] - libc: [glibc] - - '@swc/core-linux-arm64-musl@1.7.25': - resolution: {integrity: sha512-+/I7AzzY4066bvKLTyAZXLL0dPpWhRUh0ja4cZNZ+0Gpn8FmtWDwZKCriIWkDlD1gSuXm8+iOaaLGhEwIquOpQ==} - engines: {node: '>=10'} - cpu: [arm64] - os: [linux] - libc: [musl] - - '@swc/core-linux-x64-gnu@1.7.25': - resolution: {integrity: sha512-BPtnKyiBVMZyN6ml7oHGX9wuSLHN06nT1x1TM9wcSKSx6y+BEKb8jSmzrKzM7K5LnfOiy4+ARCb4HrMkXIQjUg==} - engines: {node: '>=10'} - cpu: [x64] - os: [linux] - libc: [glibc] - - '@swc/core-linux-x64-musl@1.7.25': - resolution: {integrity: sha512-ZlZztuvy2hvfoYg5gYHYuc2mssgzGq1kKanF9kPdICsTmze6t7AvkSfmlTN7/YGuO//yDDJR1GR0EuXwOAJqPw==} - engines: {node: '>=10'} - cpu: [x64] - os: [linux] - libc: [musl] - - '@swc/core-win32-arm64-msvc@1.7.25': - resolution: {integrity: sha512-k3QsHJ+53BVhRUeC7NJOMxdMGexBIhFmL8Ex39vqWVvDZgnOepMFu9/G1pm04xBHSqcb0lioDj5WirAoy4VusQ==} - engines: {node: '>=10'} - cpu: [arm64] - os: [win32] - - '@swc/core-win32-ia32-msvc@1.7.25': - resolution: {integrity: sha512-3PW8LDgS7eIdjeGLNYhO1XLXyZJZ+aLjf79am8+HqfzVkmz+uIK39FcFxeF6A/LUsuQBMa3Geg++rS38kviMEA==} - engines: {node: '>=10'} - cpu: [ia32] - os: [win32] - - '@swc/core-win32-x64-msvc@1.7.25': - resolution: {integrity: sha512-iYpJNfIzPwahwPgddb9PHYichdFoS/2NR4Gaemv9s6nzTguS4vx/YT1oFGwuGMP0RyOdmAN2rEfPh7sJktqWfA==} - engines: {node: '>=10'} - cpu: [x64] - os: [win32] - - '@swc/core@1.7.25': - resolution: {integrity: sha512-EWTWdb0GD+Z9CByvW5j5b9d1cFr9P6hy7TkGgAwnhKxGwzGu8BHTG3ou28KY6P57yZXDVKB0exWmSNRIv6LYCg==} - engines: {node: '>=10'} - peerDependencies: - '@swc/helpers': '*' - peerDependenciesMeta: - '@swc/helpers': - optional: true - - '@swc/counter@0.1.3': - resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} - - '@swc/helpers@0.5.13': - resolution: {integrity: sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==} - - '@swc/types@0.1.12': - resolution: {integrity: sha512-wBJA+SdtkbFhHjTMYH+dEH1y4VpfGdAc2Kw/LK09i9bXd/K6j6PkDcFCEzb6iVfZMkPRrl/q0e3toqTAJdkIVA==} - '@szmarczak/http-timer@5.0.1': resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==} engines: {node: '>=14.16'} @@ -11731,7 +11637,7 @@ snapshots: yaml: 2.4.5 yargs: 17.7.2 - '@netlify/build@29.51.3(@opentelemetry/api@1.8.0)(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(picomatch@3.0.1)': + '@netlify/build@29.51.3(@opentelemetry/api@1.8.0)(@types/node@20.14.11)(picomatch@3.0.1)': dependencies: '@bugsnag/js': 7.25.0 '@netlify/blobs': 7.4.0 @@ -11788,7 +11694,7 @@ snapshots: strip-ansi: 7.1.0 supports-color: 9.4.0 terminal-link: 3.0.0 - ts-node: 10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5) + ts-node: 10.9.2(@types/node@20.14.11)(typescript@5.4.5) typescript: 5.4.5 uuid: 9.0.1 yargs: 17.7.2 @@ -12457,63 +12363,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@swc/core-darwin-arm64@1.7.25': - optional: true - - '@swc/core-darwin-x64@1.7.25': - optional: true - - '@swc/core-linux-arm-gnueabihf@1.7.25': - optional: true - - '@swc/core-linux-arm64-gnu@1.7.25': - optional: true - - '@swc/core-linux-arm64-musl@1.7.25': - optional: true - - '@swc/core-linux-x64-gnu@1.7.25': - optional: true - - '@swc/core-linux-x64-musl@1.7.25': - optional: true - - '@swc/core-win32-arm64-msvc@1.7.25': - optional: true - - '@swc/core-win32-ia32-msvc@1.7.25': - optional: true - - '@swc/core-win32-x64-msvc@1.7.25': - optional: true - - '@swc/core@1.7.25(@swc/helpers@0.5.13)': - dependencies: - '@swc/counter': 0.1.3 - '@swc/types': 0.1.12 - optionalDependencies: - '@swc/core-darwin-arm64': 1.7.25 - '@swc/core-darwin-x64': 1.7.25 - '@swc/core-linux-arm-gnueabihf': 1.7.25 - '@swc/core-linux-arm64-gnu': 1.7.25 - '@swc/core-linux-arm64-musl': 1.7.25 - '@swc/core-linux-x64-gnu': 1.7.25 - '@swc/core-linux-x64-musl': 1.7.25 - '@swc/core-win32-arm64-msvc': 1.7.25 - '@swc/core-win32-ia32-msvc': 1.7.25 - '@swc/core-win32-x64-msvc': 1.7.25 - '@swc/helpers': 0.5.13 - - '@swc/counter@0.1.3': {} - - '@swc/helpers@0.5.13': - dependencies: - tslib: 2.6.2 - - '@swc/types@0.1.12': - dependencies: - '@swc/counter': 0.1.3 - '@szmarczak/http-timer@5.0.1': dependencies: defer-to-connect: 2.0.1 @@ -17395,12 +17244,12 @@ snapshots: nested-error-stacks@2.1.1: {} - netlify-cli@17.33.4(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/express@4.17.21)(@types/node@20.14.11)(bufferutil@4.0.8)(picomatch@3.0.1)(utf-8-validate@5.0.10): + netlify-cli@17.33.4(@types/express@4.17.21)(@types/node@20.14.11)(bufferutil@4.0.8)(picomatch@3.0.1)(utf-8-validate@5.0.10): dependencies: '@bugsnag/js': 7.25.0 '@fastify/static': 7.0.4 '@netlify/blobs': 7.4.0 - '@netlify/build': 29.51.3(@opentelemetry/api@1.8.0)(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(picomatch@3.0.1) + '@netlify/build': 29.51.3(@opentelemetry/api@1.8.0)(@types/node@20.14.11)(picomatch@3.0.1) '@netlify/build-info': 7.14.1 '@netlify/config': 20.17.1 '@netlify/edge-bundler': 12.2.2(supports-color@9.4.0) @@ -18146,13 +17995,13 @@ snapshots: camelcase-css: 2.0.1 postcss: 8.4.39 - postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5)): + postcss-load-config@4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5)): dependencies: lilconfig: 3.1.1 yaml: 2.4.5 optionalDependencies: postcss: 8.4.39 - ts-node: 10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5) + ts-node: 10.9.2(@types/node@20.14.11)(typescript@5.4.5) postcss-nested@6.0.1(postcss@8.4.39): dependencies: @@ -19382,7 +19231,7 @@ snapshots: transitivePeerDependencies: - supports-color - tailwindcss@3.4.6(ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5)): + tailwindcss@3.4.6(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5)): dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 @@ -19401,7 +19250,7 @@ snapshots: postcss: 8.4.39 postcss-import: 15.1.0(postcss@8.4.39) postcss-js: 4.0.1(postcss@8.4.39) - postcss-load-config: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5)) + postcss-load-config: 4.0.2(postcss@8.4.39)(ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5)) postcss-nested: 6.0.1(postcss@8.4.39) postcss-selector-parser: 6.0.15 resolve: 1.22.8 @@ -19575,7 +19424,7 @@ snapshots: ts-interface-checker@0.1.13: {} - ts-node@10.9.2(@swc/core@1.7.25(@swc/helpers@0.5.13))(@types/node@20.14.11)(typescript@5.4.5): + ts-node@10.9.2(@types/node@20.14.11)(typescript@5.4.5): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.9 @@ -19592,8 +19441,6 @@ snapshots: typescript: 5.4.5 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 - optionalDependencies: - '@swc/core': 1.7.25(@swc/helpers@0.5.13) ts-toolbelt@9.6.0: {} diff --git a/starters/playwright.config.ts b/starters/playwright.config.ts index 8e70ab77920..f47920e7a1b 100644 --- a/starters/playwright.config.ts +++ b/starters/playwright.config.ts @@ -29,7 +29,7 @@ const config: PlaywrightTestConfig = { expect: { timeout: inGithubCI ? 120000 : 10000 }, webServer: { command: - "pnpm tsx --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3301", + "pnpm tsx --require ./scripts/runBefore.ts starters/dev-server.ts 3301", port: 3301, reuseExistingServer: !process.env.CI, }, From 9f4c2266adb5f2022365fcea4eabe194f1bcc691 Mon Sep 17 00:00:00 2001 From: wuls Date: Tue, 22 Oct 2024 10:34:13 +0800 Subject: [PATCH 13/14] solve conflict --- .changeset/loud-deers-run.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/loud-deers-run.md b/.changeset/loud-deers-run.md index ba3415aed33..876e57f62b8 100644 --- a/.changeset/loud-deers-run.md +++ b/.changeset/loud-deers-run.md @@ -1,5 +1,5 @@ --- -'create-qwik': major +'create-qwik': patch --- migration from tsm to ts node From b491a0d9670d716007a159bfb8ba4f9468f1a955 Mon Sep 17 00:00:00 2001 From: wuls Date: Thu, 31 Oct 2024 09:12:52 +0800 Subject: [PATCH 14/14] fix bug --- .changeset/loud-deers-run.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/loud-deers-run.md b/.changeset/loud-deers-run.md index 876e57f62b8..985fe2f018b 100644 --- a/.changeset/loud-deers-run.md +++ b/.changeset/loud-deers-run.md @@ -2,4 +2,4 @@ 'create-qwik': patch --- -migration from tsm to ts node +INFRA: migration from tsm to tsx