diff --git a/.node-version b/.node-version index 3c032078a4a..a45fd52cc58 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -18 +24 diff --git a/.nvmrc b/.nvmrc index 2bd5a0a98a3..a45fd52cc58 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -22 +24 diff --git a/package.json b/package.json index 08a50e71287..6a5b0fe77fb 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,6 @@ "terser": "5.44.0", "tmp": "0.2.5", "tree-kill": "1.2.2", - "tsx": "4.20.6", "typescript": "5.4.5", "typescript-eslint": "8.38.0", "undici": "*", @@ -182,36 +181,36 @@ "packageManager": "pnpm@10.14.0", "private": true, "scripts": { - "api.update": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --api --dev", - "build": "tsx --require ./scripts/runBefore.ts scripts/index.ts", + "api.update": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --api --dev", + "build": "node --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": "tsx ./scripts/build-clean.ts", - "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.ts scripts/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.clean": "node ./scripts/build-clean.ts", + "build.cli": "node --require ./scripts/runBefore.ts scripts/index.ts --cli --dev", + "build.cli.prod": "node --require ./scripts/runBefore.ts scripts/index.ts --cli", + "build.core": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --qwikcity --api --platform-binding", + "build.eslint": "node --require ./scripts/runBefore.ts scripts/index.ts --eslint", + "build.full": "node --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 --require ./scripts/runBefore.ts scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding-wasm-copy", + "build.only_javascript": "node --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": "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.qwik-react": "tsx --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikreact", - "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", + "build.platform": "node --require ./scripts/runBefore.ts scripts/index.ts --platform-binding", + "build.platform.copy": "node --require ./scripts/runBefore.ts scripts/index.ts --platform-binding-wasm-copy", + "build.qwik-city": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikcity", + "build.qwik-react": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --qwikreact", + "build.validate": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api --eslint --qwikcity --platform-binding --wasm --validate", + "build.vite": "node --require ./scripts/runBefore.ts scripts/index.ts --tsc --build --api --qwikcity --eslint --platform-binding-wasm-copy", + "build.wasm": "node --require ./scripts/runBefore.ts scripts/index.ts --wasm", + "build.watch": "node --require ./scripts/runBefore.ts scripts/index.ts --build --qwikcity --watch --dev --platform-binding", "change": "changeset", - "cli": "pnpm build.cli && node packages/create-qwik/create-qwik.cjs && tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts --copy-local-qwik-dist", + "cli": "pnpm build.cli && node packages/create-qwik/create-qwik.cjs && node --require ./scripts/runBefore.ts scripts/validate-cli.ts --copy-local-qwik-dist", "cli.qwik": "pnpm build.cli && node packages/qwik/qwik-cli.cjs", - "cli.validate": "tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts", + "cli.validate": "node --require ./scripts/runBefore.ts scripts/validate-cli.ts", "deps": "corepack pnpm upgrade -i -r --latest && syncpack fix-mismatches && corepack pnpm dedupe", "docs.dev": "pnpm -C packages/docs build.repl-sw && pnpm -C packages/docs dev", "docs.preview": "pnpm -C packages/docs preview", - "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", + "docs.sync": "node --require ./scripts/runBefore.ts scripts/docs_sync/index.ts && pnpm fmt", + "eslint.update": "node --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", @@ -226,13 +225,13 @@ "preinstall": "npx only-allow pnpm", "prepare": "simple-git-hooks", "prettier.fix": "prettier --cache --write .", - "qwik-push-build-repos": "tsx --require ./scripts/runBefore.ts ./scripts/qwik-push-build-repos.ts", + "qwik-push-build-repos": "node --require ./scripts/runBefore.ts ./scripts/qwik-push-build-repos.ts", "release": "changeset publish", "release.fixup-package-json": "syncpack fix-mismatches --config syncpack-release-conf.json", "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": "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", + "serve": "node --require ./scripts/runBefore.ts --inspect --conditions=development starters/dev-server.ts 3300", + "serve.debug": "node --require ./scripts/runBefore.ts --inspect-brk --conditions=development starters/dev-server.ts 3300", "start": "pnpm run --stream \"/.*\\.watch/\"", "test": "pnpm build.full && pnpm test.unit && pnpm test.e2e", "test.e2e": "pnpm test.e2e.chromium && pnpm test.e2e.webkit && test.e2e.integrations", @@ -254,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": "tsx --require ./scripts/runBefore.ts scripts/update-qwik-builds.ts packages/docs && tsx scripts/update-qwik-builds.ts packages/insights; pnpm install", + "update.qwik.builds": "node --require ./scripts/runBefore.ts scripts/update-qwik-builds.ts packages/docs && node scripts/update-qwik-builds.ts packages/insights; pnpm install", "vitest": "vitest" }, "simple-git-hooks": { diff --git a/packages/docs/package.json b/packages/docs/package.json index a3454036bd6..d5c60e7189c 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -76,12 +76,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": "tsx codesandbox.sync.ts", - "contributors": "tsx contributors.ts", + "codesandbox.sync": "node codesandbox.sync.ts", + "contributors": "node contributors.ts", "deploy": "wrangler pages publish ./dist", - "dev": "tsx check-qwik-build.ts && vite --mode ssr --open", + "dev": "node check-qwik-build.ts && vite --mode ssr --open", "dev.debug": "node --inspect-brk ../../node_modules/vite/bin/vite.js --mode ssr --force", - "prebuild.core": "tsx check-qwik-build.ts", + "prebuild.core": "node 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/docs/vite.config.mts b/packages/docs/vite.config.mts index 0ad0ef8bc0e..d61c839adfa 100644 --- a/packages/docs/vite.config.mts +++ b/packages/docs/vite.config.mts @@ -13,7 +13,7 @@ import path, { resolve } from 'node:path'; import { defineConfig, loadEnv, type Plugin, type Rollup } from 'vite'; import { examplesData, playgroundData, rawSource, tutorialData } from './vite.repl-apps'; import { sourceResolver } from './vite.source-resolver'; -import { compiledStringPlugin } from '../../scripts/compiled-string-plugin'; +import { compiledStringPlugin } from '../../scripts/compiled-string-plugin.js'; const PUBLIC_QWIK_INSIGHTS_KEY = loadEnv('', '.', 'PUBLIC').PUBLIC_QWIK_INSIGHTS_KEY; const docsDir = new URL(import.meta.url).pathname; diff --git a/packages/insights/package.json b/packages/insights/package.json index dce1f88e037..ede578c8275 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": "tsx src/cluster.ts", + "test.cluster": "node src/cluster.ts", "test.unit": "vitest", "test.watch": "vitest --watch" }, diff --git a/packages/qwik-labs/vite.config.mts b/packages/qwik-labs/vite.config.mts index 6680e891390..aaf29dbc888 100644 --- a/packages/qwik-labs/vite.config.mts +++ b/packages/qwik-labs/vite.config.mts @@ -1,7 +1,7 @@ import { defineConfig } from 'vite'; import { qwikVite } from '@builder.io/qwik/optimizer'; import dtsPlugin from 'vite-plugin-dts'; -import { compiledStringPlugin } from '../../scripts/compiled-string-plugin'; +import { compiledStringPlugin } from '../../scripts/compiled-string-plugin.js'; export default defineConfig(() => { return { diff --git a/packages/qwik/src/cli/utils/app-command.ts b/packages/qwik/src/cli/utils/app-command.ts index c6e083f71b8..f43eed6d284 100644 --- a/packages/qwik/src/cli/utils/app-command.ts +++ b/packages/qwik/src/cli/utils/app-command.ts @@ -1,6 +1,6 @@ import { existsSync, readFileSync } from 'node:fs'; import { dirname, join, resolve } from 'node:path'; -import type { PackageJSON } from '../../../../../scripts/util'; +import type { PackageJSON } from '../../../../../scripts/types.ts'; export class AppCommand { args: string[]; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9909ae4451d..6662c158d73 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -108,7 +108,7 @@ importers: version: 1.0.2 '@vitejs/plugin-basic-ssl': specifier: 2.1.0 - version: 2.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + version: 2.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) all-contributors-cli: specifier: 6.26.1 version: 6.26.1 @@ -208,9 +208,6 @@ importers: tree-kill: specifier: 1.2.2 version: 1.2.2 - tsx: - specifier: 4.20.6 - version: 4.20.6 typescript: specifier: 5.4.5 version: 5.4.5 @@ -225,19 +222,19 @@ importers: version: 6.0.3 vite: specifier: 7.1.11 - version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) vite-imagetools: specifier: 9.0.0 version: 9.0.0(rollup@4.52.4) vite-plugin-dts: specifier: 3.9.1 - version: 3.9.1(@types/node@20.19.0)(rollup@4.52.4)(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + version: 3.9.1(@types/node@20.19.0)(rollup@4.52.4)(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) vite-tsconfig-paths: specifier: 5.1.4 - version: 5.1.4(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + version: 5.1.4(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) vitest: specifier: 3.2.4 - version: 3.2.4(@types/debug@4.1.12)(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + version: 3.2.4(@types/debug@4.1.12)(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) watchlist: specifier: 0.3.1 version: 0.3.1 @@ -368,7 +365,7 @@ importers: version: 2.53.0 '@tailwindcss/vite': specifier: 4.1.11 - version: 4.1.11(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + version: 4.1.11(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) '@types/leaflet': specifier: 1.9.20 version: 1.9.20 @@ -452,13 +449,13 @@ importers: version: 0.33.3 vite: specifier: 7.1.11 - version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) vite-plugin-inspect: specifier: 11.3.3 - version: 11.3.3(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + version: 11.3.3(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) vite-tsconfig-paths: specifier: 5.1.4 - version: 5.1.4(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + version: 5.1.4(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) wrangler: specifier: 3.65.1 version: 3.65.1 @@ -532,7 +529,7 @@ importers: version: 2.17.0 '@tailwindcss/vite': specifier: 4.1.11 - version: 4.1.11(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + version: 4.1.11(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) '@types/density-clustering': specifier: 1.3.3 version: 1.3.3 @@ -577,13 +574,13 @@ importers: version: 7.16.0 vite: specifier: 7.1.11 - version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) vite-tsconfig-paths: specifier: 5.1.4 - version: 5.1.4(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + version: 5.1.4(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) vitest: specifier: 3.2.4 - version: 3.2.4(@types/debug@4.1.12)(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + version: 3.2.4(@types/debug@4.1.12)(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) zod: specifier: 3.25.48 version: 3.25.48 @@ -666,7 +663,7 @@ importers: version: 6.0.3 vite: specifier: '>=5 <8' - version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) vite-imagetools: specifier: ^9.0.0 version: 9.0.0(rollup@4.52.5) @@ -792,7 +789,7 @@ importers: version: 7.16.0 vite: specifier: 7.1.11 - version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) zod: specifier: 3.25.48 version: 3.25.48 @@ -819,7 +816,7 @@ importers: version: 5.4.5 vite: specifier: 7.1.11 - version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) packages/qwik-worker: devDependencies: @@ -828,10 +825,10 @@ importers: version: link:../qwik vite: specifier: 7.1.11 - version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + version: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) vite-plugin-static-copy: specifier: 3.1.2 - version: 3.1.2(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + version: 3.1.2(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) packages/supabase-auth-helpers-qwik: devDependencies: @@ -9625,11 +9622,6 @@ packages: peerDependencies: typescript: 5.4.5 - tsx@4.20.6: - resolution: {integrity: sha512-ytQKuwgmrrkDTFP4LjR0ToE2nqgy886GpvRSpU0JAnrdBYppuY5rLkRUYPU1yCryb24SsKBTL/hlDQAEFVwtZg==} - engines: {node: '>=18.0.0'} - hasBin: true - tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} @@ -13072,12 +13064,12 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.1.11 '@tailwindcss/oxide-win32-x64-msvc': 4.1.11 - '@tailwindcss/vite@4.1.11(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1))': + '@tailwindcss/vite@4.1.11(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1))': dependencies: '@tailwindcss/node': 4.1.11 '@tailwindcss/oxide': 4.1.11 tailwindcss: 4.1.11 - vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) '@tokenizer/token@0.3.0': {} @@ -13523,9 +13515,9 @@ snapshots: - rollup - supports-color - '@vitejs/plugin-basic-ssl@2.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1))': + '@vitejs/plugin-basic-ssl@2.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1))': dependencies: - vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) '@vitest/expect@3.2.4': dependencies: @@ -13535,13 +13527,13 @@ snapshots: chai: 5.3.3 tinyrainbow: 2.0.0 - '@vitest/mocker@3.2.4(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1))': + '@vitest/mocker@3.2.4(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1))': dependencies: '@vitest/spy': 3.2.4 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) '@vitest/pretty-format@3.2.4': dependencies: @@ -20207,13 +20199,6 @@ snapshots: tslib: 1.14.1 typescript: 5.4.5 - tsx@4.20.6: - dependencies: - esbuild: 0.25.10 - get-tsconfig: 4.11.0 - optionalDependencies: - fsevents: 2.3.3 - tunnel-agent@0.6.0: dependencies: safe-buffer: 5.2.1 @@ -20494,15 +20479,15 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.3 - vite-dev-rpc@1.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)): + vite-dev-rpc@1.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)): dependencies: birpc: 2.6.1 - vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) - vite-hot-client: 2.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) + vite-hot-client: 2.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) - vite-hot-client@2.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)): + vite-hot-client@2.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)): dependencies: - vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) vite-imagetools@9.0.0(rollup@4.52.4): dependencies: @@ -20520,13 +20505,13 @@ snapshots: transitivePeerDependencies: - rollup - vite-node@3.2.4(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1): + vite-node@3.2.4(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1): dependencies: cac: 6.7.14 debug: 4.4.3(supports-color@9.4.0) es-module-lexer: 1.7.0 pathe: 2.0.3 - vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) transitivePeerDependencies: - '@types/node' - jiti @@ -20541,7 +20526,7 @@ snapshots: - tsx - yaml - vite-plugin-dts@3.9.1(@types/node@20.19.0)(rollup@4.52.4)(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)): + vite-plugin-dts@3.9.1(@types/node@20.19.0)(rollup@4.52.4)(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)): dependencies: '@microsoft/api-extractor': 7.43.0(@types/node@20.19.0) '@rollup/pluginutils': 5.3.0(rollup@4.52.4) @@ -20552,13 +20537,13 @@ snapshots: typescript: 5.4.5 vue-tsc: 1.8.27(typescript@5.4.5) optionalDependencies: - vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-inspect@11.3.3(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)): + vite-plugin-inspect@11.3.3(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)): dependencies: ansis: 4.2.0 debug: 4.4.3(supports-color@9.4.0) @@ -20568,32 +20553,32 @@ snapshots: perfect-debounce: 2.0.0 sirv: 3.0.2 unplugin-utils: 0.3.1 - vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) - vite-dev-rpc: 1.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) + vite-dev-rpc: 1.1.0(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) transitivePeerDependencies: - supports-color - vite-plugin-static-copy@3.1.2(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)): + vite-plugin-static-copy@3.1.2(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)): dependencies: chokidar: 3.6.0 fs-extra: 11.3.2 p-map: 7.0.3 picocolors: 1.1.1 tinyglobby: 0.2.15 - vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) - vite-tsconfig-paths@5.1.4(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)): + vite-tsconfig-paths@5.1.4(typescript@5.4.5)(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)): dependencies: debug: 4.4.3(supports-color@9.4.0) globrex: 0.1.2 tsconfck: 3.1.6(typescript@5.4.5) optionalDependencies: - vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) transitivePeerDependencies: - supports-color - typescript - vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1): + vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1): dependencies: esbuild: 0.25.11 fdir: 6.5.0(picomatch@4.0.3) @@ -20607,14 +20592,13 @@ snapshots: jiti: 2.6.0 lightningcss: 1.30.1 terser: 5.44.0 - tsx: 4.20.6 yaml: 2.6.1 - vitest@3.2.4(@types/debug@4.1.12)(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1): + vitest@3.2.4(@types/debug@4.1.12)(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1): dependencies: '@types/chai': 5.2.2 '@vitest/expect': 3.2.4 - '@vitest/mocker': 3.2.4(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1)) + '@vitest/mocker': 3.2.4(vite@7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1)) '@vitest/pretty-format': 3.2.4 '@vitest/runner': 3.2.4 '@vitest/snapshot': 3.2.4 @@ -20632,8 +20616,8 @@ snapshots: tinyglobby: 0.2.15 tinypool: 1.1.1 tinyrainbow: 2.0.0 - vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) - vite-node: 3.2.4(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(tsx@4.20.6)(yaml@2.6.1) + vite: 7.1.11(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) + vite-node: 3.2.4(@types/node@20.19.0)(jiti@2.6.0)(lightningcss@1.30.1)(terser@5.44.0)(yaml@2.6.1) why-is-node-running: 2.3.0 optionalDependencies: '@types/debug': 4.1.12 diff --git a/scripts/api-docs.ts b/scripts/api-docs.ts index df0cecf4bd7..3691979ef2d 100644 --- a/scripts/api-docs.ts +++ b/scripts/api-docs.ts @@ -2,7 +2,7 @@ import { execa } from 'execa'; import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs'; import { join } from 'node:path'; import { format } from 'prettier'; -import { type BuildConfig } from './util'; +import { type BuildConfig } from './util.ts'; export async function generateQwikApiMarkdownDocs(config: BuildConfig, apiJsonInputDir: string) { await generateApiMarkdownPackageDocs(config, apiJsonInputDir, ['qwik']); diff --git a/scripts/api.ts b/scripts/api.ts index 99e5fabd522..a59cceeed31 100644 --- a/scripts/api.ts +++ b/scripts/api.ts @@ -1,8 +1,8 @@ import { Extractor, ExtractorConfig } from '@microsoft/api-extractor'; import { readFileSync, writeFileSync } from 'node:fs'; import { join } from 'node:path'; -import { generateQwikApiMarkdownDocs, generateQwikCityApiMarkdownDocs } from './api-docs'; -import { type BuildConfig, panic, copyFile, ensureDir } from './util'; +import { generateQwikApiMarkdownDocs, generateQwikCityApiMarkdownDocs } from './api-docs.ts'; +import { type BuildConfig, panic, copyFile, ensureDir } from './util.ts'; /** * Create each submodule's bundled dts file, and ensure the public API has not changed for a diff --git a/scripts/binding-platform.ts b/scripts/binding-platform.ts index 58cdc78880a..e42aa9eab74 100644 --- a/scripts/binding-platform.ts +++ b/scripts/binding-platform.ts @@ -2,7 +2,7 @@ import spawn from 'cross-spawn'; import { copyFile, writeFile } from 'fs/promises'; import { existsSync } from 'node:fs'; import { join } from 'node:path'; -import { ensureDir, type BuildConfig } from './util'; +import { ensureDir, type BuildConfig } from './util.ts'; export async function buildPlatformBinding(config: BuildConfig) { await new Promise((resolve, reject) => { diff --git a/scripts/binding-wasm.ts b/scripts/binding-wasm.ts index bd1f98255aa..b963698d325 100644 --- a/scripts/binding-wasm.ts +++ b/scripts/binding-wasm.ts @@ -1,4 +1,4 @@ -import { type BuildConfig, copyFile, emptyDir, ensureDir } from './util'; +import { type BuildConfig, copyFile, emptyDir, ensureDir } from './util.ts'; import spawn from 'cross-spawn'; import { join } from 'node:path'; import { rollup } from 'rollup'; diff --git a/scripts/build.ts b/scripts/build.ts index e2921a2edf4..52a62a75051 100644 --- a/scripts/build.ts +++ b/scripts/build.ts @@ -1,36 +1,36 @@ import { rmSync } from 'fs'; import { copyFile, watch } from 'fs/promises'; import { join } from 'path'; -import { apiExtractorQwik, apiExtractorQwikCity } from './api'; -import { buildPlatformBinding, copyPlatformBindingWasm } from './binding-platform'; -import { buildWasmBinding } from './binding-wasm'; -import { buildCreateQwikCli } from './create-qwik-cli'; -import { buildEslint } from './eslint'; -import { buildQwikAuth } from './qwik-auth'; -import { buildQwikCity } from './qwik-city'; -import { buildQwikLabs } from './qwik-labs'; -import { buildQwikReact } from './qwik-react'; -import { buildQwikWorker } from './qwik-worker'; +import { apiExtractorQwik, apiExtractorQwikCity } from './api.ts'; +import { buildPlatformBinding, copyPlatformBindingWasm } from './binding-platform.ts'; +import { buildWasmBinding } from './binding-wasm.ts'; +import { buildCreateQwikCli } from './create-qwik-cli.ts'; +import { buildEslint } from './eslint.ts'; +import { buildQwikAuth } from './qwik-auth.ts'; +import { buildQwikCity } from './qwik-city.ts'; +import { buildQwikLabs } from './qwik-labs.ts'; +import { buildQwikReact } from './qwik-react.ts'; +import { buildQwikWorker } from './qwik-worker.ts'; import { commitPrepareReleaseVersion, prepareReleaseVersion, publish, setDistVersion, setReleaseVersion, -} from './release'; -import { submoduleBuild } from './submodule-build'; -import { submoduleCli } from './submodule-cli'; -import { submoduleCore } from './submodule-core'; -import { submoduleOptimizer } from './submodule-optimizer'; -import { submoduleQwikLoader } from './submodule-qwikloader'; -import { submoduleServer } from './submodule-server'; -import { submoduleTesting } from './submodule-testing'; -import { buildSupabaseAuthHelpers } from './supabase-auth-helpers'; -import { tsc, tscQwik, tscQwikCity } from './tsc'; -import { tscDocs } from './tsc-docs'; -import { emptyDir, ensureDir, panic, type BuildConfig } from './util'; -import { validateBuild } from './validate-build'; -import { submodulePreloader } from './submodule-preloader'; +} from './release.ts'; +import { submoduleBuild } from './submodule-build.ts'; +import { submoduleCli } from './submodule-cli.ts'; +import { submoduleCore } from './submodule-core.ts'; +import { submoduleOptimizer } from './submodule-optimizer.ts'; +import { submoduleQwikLoader } from './submodule-qwikloader.ts'; +import { submoduleServer } from './submodule-server.ts'; +import { submoduleTesting } from './submodule-testing.ts'; +import { buildSupabaseAuthHelpers } from './supabase-auth-helpers.ts'; +import { tsc, tscQwik, tscQwikCity } from './tsc.ts'; +import { tscDocs } from './tsc-docs.ts'; +import { emptyDir, ensureDir, panic, type BuildConfig } from './util.ts'; +import { validateBuild } from './validate-build.ts'; +import { submodulePreloader } from './submodule-preloader.ts'; /** * Complete a full build for all of the package's submodules. Passed in config has all the correct diff --git a/scripts/create-qwik-cli.ts b/scripts/create-qwik-cli.ts index 9362914c68c..f1c111740e5 100644 --- a/scripts/create-qwik-cli.ts +++ b/scripts/create-qwik-cli.ts @@ -2,7 +2,7 @@ import { build } from 'esbuild'; import { existsSync } from 'node:fs'; import { rm } from 'node:fs/promises'; import { basename, join } from 'node:path'; -import { readPackageJson, writePackageJson } from './package-json'; +import { readPackageJson, writePackageJson } from './package-json.ts'; import { type BuildConfig, copyFile, @@ -14,7 +14,7 @@ import { readdir, run, stat, -} from './util'; +} from './util.ts'; const PACKAGE = 'create-qwik'; diff --git a/scripts/docs_sync/fetch_hackmd.ts b/scripts/docs_sync/fetch_hackmd.ts index 86ed6a192d9..0fa7ed79226 100644 --- a/scripts/docs_sync/fetch_hackmd.ts +++ b/scripts/docs_sync/fetch_hackmd.ts @@ -1,5 +1,5 @@ import { join } from 'node:path'; -import { readLines, scanFiles, writeFileLines } from './util'; +import { readLines, scanFiles, writeFileLines } from './util.ts'; export function main(dir: string) { console.log('Fetching HackMD content...'); diff --git a/scripts/docs_sync/index.ts b/scripts/docs_sync/index.ts index 304dfe5ceae..2976a4044d0 100644 --- a/scripts/docs_sync/index.ts +++ b/scripts/docs_sync/index.ts @@ -1,4 +1,4 @@ -import { main } from './main'; +import { main } from './main.ts'; import { join } from 'node:path'; main(join(process.cwd(), 'packages')); diff --git a/scripts/docs_sync/main.ts b/scripts/docs_sync/main.ts index 7ceefe67f7f..85fa182d15d 100644 --- a/scripts/docs_sync/main.ts +++ b/scripts/docs_sync/main.ts @@ -1,5 +1,5 @@ import { join, dirname } from 'node:path'; -import { readLines, scanFiles, writeFileLines } from './util'; +import { readLines, scanFiles, writeFileLines } from './util.ts'; export function main(dir: string) { console.log('DOC SYNC', dir); diff --git a/scripts/eslint.ts b/scripts/eslint.ts index 2611674c286..ae1b8cd5606 100644 --- a/scripts/eslint.ts +++ b/scripts/eslint.ts @@ -1,7 +1,7 @@ -import { type BuildConfig, run, nodeTarget } from './util'; +import { type BuildConfig, run, nodeTarget } from './util.ts'; import { join } from 'node:path'; import { build } from 'esbuild'; -import { readPackageJson, writePackageJson } from './package-json'; +import { readPackageJson, writePackageJson } from './package-json.ts'; const PACKAGE = 'eslint-plugin-qwik'; diff --git a/scripts/index.ts b/scripts/index.ts index b087aef9090..540b7d61efe 100644 --- a/scripts/index.ts +++ b/scripts/index.ts @@ -3,8 +3,8 @@ * registering typescript files with esbuild-register to allow Node.js to build .ts files * on-demand. */ -import { build } from './build'; -import { loadConfig } from './util'; +import { build } from './build.ts'; +import { loadConfig } from './util.ts'; const args = process.argv.slice(2); diff --git a/scripts/package-json.ts b/scripts/package-json.ts index 7f6a36aaf29..19f023db31f 100644 --- a/scripts/package-json.ts +++ b/scripts/package-json.ts @@ -1,5 +1,5 @@ -import { ensureDir, type PackageJSON } from './util'; -import { readFile, writeFile } from './util'; +import { ensureDir, type PackageJSON } from './util.ts'; +import { readFile, writeFile } from './util.ts'; import { join } from 'node:path'; export async function readPackageJson(pkgJsonDir: string) { diff --git a/scripts/qwik-auth.ts b/scripts/qwik-auth.ts index 7c97a4c4a06..d1e4a9e9863 100644 --- a/scripts/qwik-auth.ts +++ b/scripts/qwik-auth.ts @@ -1,4 +1,4 @@ -import { type BuildConfig, copyDir, panic } from './util'; +import { type BuildConfig, copyDir, panic } from './util.ts'; import { join } from 'node:path'; import { execa } from 'execa'; diff --git a/scripts/qwik-city.ts b/scripts/qwik-city.ts index 5247e6f7268..406e3430df9 100644 --- a/scripts/qwik-city.ts +++ b/scripts/qwik-city.ts @@ -3,7 +3,7 @@ import { execa } from 'execa'; import { readFile } from 'node:fs/promises'; import { join } from 'node:path'; import { rollup } from 'rollup'; -import { type BuildConfig, emptyDir, importPath, nodeTarget, panic } from './util'; +import { type BuildConfig, emptyDir, importPath, nodeTarget, panic } from './util.ts'; export async function buildQwikCity(config: BuildConfig) { if (!config.dev) { diff --git a/scripts/qwik-labs.ts b/scripts/qwik-labs.ts index 80a5bcbe30f..a49385e901f 100644 --- a/scripts/qwik-labs.ts +++ b/scripts/qwik-labs.ts @@ -1,4 +1,4 @@ -import { type BuildConfig, panic } from './util'; +import { type BuildConfig, panic } from './util.ts'; import { join } from 'node:path'; import { execa } from 'execa'; diff --git a/scripts/qwik-react.ts b/scripts/qwik-react.ts index f3eaf1ab0fb..175f12678e0 100644 --- a/scripts/qwik-react.ts +++ b/scripts/qwik-react.ts @@ -1,4 +1,4 @@ -import { type BuildConfig, copyDir, panic } from './util'; +import { type BuildConfig, copyDir, panic } from './util.ts'; import { join } from 'node:path'; import { execa } from 'execa'; diff --git a/scripts/qwik-worker.ts b/scripts/qwik-worker.ts index 3ab7a8d3335..c164177e717 100644 --- a/scripts/qwik-worker.ts +++ b/scripts/qwik-worker.ts @@ -1,4 +1,4 @@ -import { type BuildConfig, copyDir, panic } from './util'; +import { type BuildConfig, copyDir, panic } from './util.ts'; import { join } from 'node:path'; import { execa } from 'execa'; diff --git a/scripts/release.ts b/scripts/release.ts index e48770d4edc..0d61191ac90 100644 --- a/scripts/release.ts +++ b/scripts/release.ts @@ -4,11 +4,11 @@ import { join } from 'node:path'; import { fileURLToPath } from 'node:url'; import prompts from 'prompts'; import semver from 'semver'; -import { publishCreateQwikCli } from './create-qwik-cli'; -import { publishEslint } from './eslint'; -import { readPackageJson, writePackageJson } from './package-json'; -import { type BuildConfig, panic, run } from './util'; -import { validateBuild } from './validate-build'; +import { publishCreateQwikCli } from './create-qwik-cli.ts'; +import { publishEslint } from './eslint.ts'; +import { readPackageJson, writePackageJson } from './package-json.ts'; +import { type BuildConfig, panic, run } from './util.ts'; +import { validateBuild } from './validate-build.ts'; let version: string; diff --git a/scripts/submodule-build.ts b/scripts/submodule-build.ts index 466fa236fd1..96dda70e4f9 100644 --- a/scripts/submodule-build.ts +++ b/scripts/submodule-build.ts @@ -1,7 +1,7 @@ -import { type BuildConfig, ensureDir, target, copyFile, type PackageJSON } from './util'; +import { type BuildConfig, ensureDir, target, copyFile, type PackageJSON } from './util.ts'; import { join } from 'node:path'; import { type BuildOptions, build } from 'esbuild'; -import { writePackageJson } from './package-json'; +import { writePackageJson } from './package-json.ts'; export async function submoduleBuild(config: BuildConfig) { const submodule = 'build'; diff --git a/scripts/submodule-cli.ts b/scripts/submodule-cli.ts index 888c3134f0f..033efc0b8e0 100644 --- a/scripts/submodule-cli.ts +++ b/scripts/submodule-cli.ts @@ -1,8 +1,8 @@ import { build } from 'esbuild'; import { existsSync, rmSync } from 'node:fs'; import { join } from 'node:path'; -import { copyStartersDir } from './create-qwik-cli'; -import { type BuildConfig, copyDir, getBanner, nodeTarget } from './util'; +import { copyStartersDir } from './create-qwik-cli.ts'; +import { type BuildConfig, copyDir, getBanner, nodeTarget } from './util.ts'; /** Builds @builder.io/qwik/cli */ export async function submoduleCli(config: BuildConfig) { diff --git a/scripts/submodule-core.ts b/scripts/submodule-core.ts index df6f344ecac..2ae8748a967 100644 --- a/scripts/submodule-core.ts +++ b/scripts/submodule-core.ts @@ -1,6 +1,6 @@ -import { type BuildConfig, rollupOnWarn } from './util'; +import { type BuildConfig, rollupOnWarn } from './util.ts'; import { build, type BuildOptions } from 'esbuild'; -import { getBanner, fileSize, readFile, target, writeFile } from './util'; +import { getBanner, fileSize, readFile, target, writeFile } from './util.ts'; import { type InputOptions, type OutputOptions, rollup } from 'rollup'; import { join } from 'node:path'; import { minify } from 'terser'; diff --git a/scripts/submodule-optimizer.ts b/scripts/submodule-optimizer.ts index 12f4105bf7a..24ceac99081 100644 --- a/scripts/submodule-optimizer.ts +++ b/scripts/submodule-optimizer.ts @@ -7,12 +7,12 @@ import { readFile, target, writeFile, -} from './util'; +} from './util.ts'; import { join } from 'node:path'; import { minify } from 'terser'; import { platformArchTriples } from '@napi-rs/triples'; import { constants, existsSync } from 'node:fs'; -import { inlineQwikScriptsEsBuild } from './submodule-qwikloader'; +import { inlineQwikScriptsEsBuild } from './submodule-qwikloader.ts'; import RawPlugin from 'esbuild-plugin-raw'; /** Builds @builder.io/optimizer */ diff --git a/scripts/submodule-preloader.ts b/scripts/submodule-preloader.ts index 86e92b70029..8a5aec1c041 100644 --- a/scripts/submodule-preloader.ts +++ b/scripts/submodule-preloader.ts @@ -1,6 +1,6 @@ import { join } from 'node:path'; import { build } from 'vite'; -import { fileSize, type BuildConfig } from './util'; +import { fileSize, type BuildConfig } from './util.ts'; import { minify } from 'terser'; import type { Plugin } from 'vite'; diff --git a/scripts/submodule-qwikloader.ts b/scripts/submodule-qwikloader.ts index 53f2c67deaf..89558cb74e9 100644 --- a/scripts/submodule-qwikloader.ts +++ b/scripts/submodule-qwikloader.ts @@ -7,9 +7,9 @@ import { type PackageJSON, readFile, writeFile, -} from './util'; +} from './util.ts'; import { minify } from 'terser'; -import { writePackageJson } from './package-json'; +import { writePackageJson } from './package-json.ts'; /** * Builds the qwikloader javascript files. These files can be used by other tooling, and are diff --git a/scripts/submodule-server.ts b/scripts/submodule-server.ts index 96869cc8659..35e68d4251b 100644 --- a/scripts/submodule-server.ts +++ b/scripts/submodule-server.ts @@ -1,8 +1,8 @@ import { build, type BuildOptions, type Plugin } from 'esbuild'; import { join } from 'node:path'; -import { type BuildConfig, getBanner, importPath, nodeTarget, target } from './util'; -import { inlineQwikScriptsEsBuild } from './submodule-qwikloader'; -import { readPackageJson } from './package-json'; +import { type BuildConfig, getBanner, importPath, nodeTarget, target } from './util.ts'; +import { inlineQwikScriptsEsBuild } from './submodule-qwikloader.ts'; +import { readPackageJson } from './package-json.ts'; /** * Builds @builder.io/server diff --git a/scripts/submodule-testing.ts b/scripts/submodule-testing.ts index 60d7ab5a6a1..12c8960707e 100644 --- a/scripts/submodule-testing.ts +++ b/scripts/submodule-testing.ts @@ -1,8 +1,8 @@ -import { getBanner, importPath, nodeTarget, target } from './util'; +import { getBanner, importPath, nodeTarget, target } from './util.ts'; import { build, type BuildOptions } from 'esbuild'; -import { type BuildConfig, type PackageJSON } from './util'; +import { type BuildConfig, type PackageJSON } from './util.ts'; import { join } from 'node:path'; -import { writePackageJson } from './package-json'; +import { writePackageJson } from './package-json.ts'; /** Builds @builder.io/testing */ export async function submoduleTesting(config: BuildConfig) { diff --git a/scripts/supabase-auth-helpers.ts b/scripts/supabase-auth-helpers.ts index 4b6beca5e78..fadcd46d6ba 100644 --- a/scripts/supabase-auth-helpers.ts +++ b/scripts/supabase-auth-helpers.ts @@ -1,4 +1,4 @@ -import { type BuildConfig, copyDir, panic } from './util'; +import { type BuildConfig, copyDir, panic } from './util.ts'; import { join } from 'node:path'; import { execa } from 'execa'; diff --git a/scripts/tsc-docs.ts b/scripts/tsc-docs.ts index 2ffa7e66271..71d03c49717 100644 --- a/scripts/tsc-docs.ts +++ b/scripts/tsc-docs.ts @@ -1,5 +1,5 @@ import { execa } from 'execa'; -import { type BuildConfig, panic } from './util'; +import { type BuildConfig, panic } from './util.ts'; import { join } from 'path'; // Run tsc for docs separately because it requires e.g. qwik-react types to be built first diff --git a/scripts/tsc.ts b/scripts/tsc.ts index a43e6a0ddf7..24489eea1fb 100644 --- a/scripts/tsc.ts +++ b/scripts/tsc.ts @@ -1,5 +1,5 @@ import { execa } from 'execa'; -import { type BuildConfig, panic } from './util'; +import { type BuildConfig, panic } from './util.ts'; import { join } from 'path'; // TODO DRY diff --git a/scripts/types.d.ts b/scripts/types.d.ts new file mode 100644 index 00000000000..7dfa7ea8ac4 --- /dev/null +++ b/scripts/types.d.ts @@ -0,0 +1,34 @@ +/** + * Type definitions for scripts utilities This file allows package code to import types without + * importing the implementation + */ + +export interface PackageJSON { + name?: string; + version?: string; + description?: string; + license?: string; + main?: string; + module?: string; + types?: string; + type?: 'module' | 'commonjs'; + exports?: Record; + scripts?: Record; + dependencies?: Record; + devDependencies?: Record; + peerDependencies?: Record; + optionalDependencies?: Record; + [key: string]: any; +} + +export interface BuildConfig { + rootDir: string; + srcDir: string; + srcQwikDir: string; + srcQwikCityDir: string; + packagesDir: string; + distQwikPkgDir: string; + distQwikCityPkgDir: string; + dtsDir: string; + [key: string]: any; +} diff --git a/scripts/update-qwik-builds.ts b/scripts/update-qwik-builds.ts index 512d3b0c197..d188fe97d2d 100644 --- a/scripts/update-qwik-builds.ts +++ b/scripts/update-qwik-builds.ts @@ -1,4 +1,4 @@ -import { readPackageJson, writePackageJson } from './package-json'; +import { readPackageJson, writePackageJson } from './package-json.ts'; type Repos = 'qwik' | 'qwik-city' | 'qwik-labs'; diff --git a/scripts/util.ts b/scripts/util.ts index 7da8724206c..b198738bfe8 100644 --- a/scripts/util.ts +++ b/scripts/util.ts @@ -18,7 +18,7 @@ import { fileURLToPath } from 'node:url'; import type { Plugin as RollupPlugin } from 'rollup'; import { minify, type MinifyOptions } from 'terser'; import { promisify } from 'util'; -import { readPackageJson } from './package-json'; +import { readPackageJson } from './package-json.ts'; const stringOptions = [ 'distBindingsDir', diff --git a/scripts/validate-build.ts b/scripts/validate-build.ts index 3e6943ae364..4427dc87793 100644 --- a/scripts/validate-build.ts +++ b/scripts/validate-build.ts @@ -1,7 +1,7 @@ import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs'; import { createRequire } from 'node:module'; -import { type BuildConfig, type PackageJSON, panic } from './util'; -import { access, readFile } from './util'; +import { type BuildConfig, type PackageJSON, panic } from './util.ts'; +import { access, readFile } from './util.ts'; import { basename, extname, join } from 'node:path'; import { pathToFileURL } from 'node:url'; import { rollup } from 'rollup'; diff --git a/scripts/validate-cli.ts b/scripts/validate-cli.ts index 39b663ef63b..b8613ab6518 100644 --- a/scripts/validate-cli.ts +++ b/scripts/validate-cli.ts @@ -11,10 +11,10 @@ import { } from 'node:fs'; import { join, relative } from 'node:path'; import { fileURLToPath, pathToFileURL } from 'node:url'; -import { readPackageJson, writePackageJson } from './package-json'; +import { readPackageJson, writePackageJson } from './package-json.ts'; import assert from 'assert'; -import { panic } from './util'; +import { panic } from './util.ts'; const __dirname = fileURLToPath(new URL('.', import.meta.url)); diff --git a/starters/dev-server.ts b/starters/dev-server.ts index 263cf636ea1..3d5161532ef 100644 --- a/starters/dev-server.ts +++ b/starters/dev-server.ts @@ -18,9 +18,9 @@ import { } from "node:fs"; import type { QwikManifest } from "@builder.io/qwik/optimizer"; import type { Render, RenderToStreamOptions } from "@builder.io/qwik/server"; -import type { PackageJSON } from "../scripts/util"; +import type { PackageJSON } from "../scripts/types.ts"; import { fileURLToPath, pathToFileURL } from "node:url"; -import { getErrorHtml } from "../packages/qwik-city/src/middleware/request-handler/error-handler"; +import { getErrorHtml } from "../packages/qwik-city/src/middleware/request-handler/error-handler.ts"; const isWindows = process.platform === "win32"; diff --git a/starters/playwright.config.ts b/starters/playwright.config.ts index 91168e069bb..5ff55370008 100644 --- a/starters/playwright.config.ts +++ b/starters/playwright.config.ts @@ -31,7 +31,7 @@ const config: PlaywrightTestConfig = { expect: { timeout: inGithubCI ? 120000 : 10000 }, webServer: { command: - "pnpm tsx --require ./scripts/runBefore.ts starters/dev-server.ts 3301", + "pnpm node --require ./scripts/runBefore.ts starters/dev-server.ts 3301", port: 3301, reuseExistingServer: !process.env.CI, }, diff --git a/tsconfig.json b/tsconfig.json index 0c6c0fdaf62..397195a3fd5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -46,13 +46,11 @@ "packages/qwik-worker", "packages/supabase-auth-helpers-qwik", "packages/qwik-react/src", - "scripts", "starters/apps/sandbox", "starters/apps/todo-test", "starters/apps/e2e", "starters/apps/qwikcity-test/**/*", "starters/apps/qwikcity-test.prod/**/*", - "starters/dev-server.ts", "packages/qwik-react/vite", "@types/deno.d.ts", "@types/bun.d.ts", @@ -62,6 +60,7 @@ "packages/create-qwik/dist", "packages/qwik/src", "packages/*/lib", - "scripts/eslint-docs.ts" + "scripts", + "starters/dev-server.ts" ] } diff --git a/tsconfig.scripts.json b/tsconfig.scripts.json new file mode 100644 index 00000000000..2e6310ce32f --- /dev/null +++ b/tsconfig.scripts.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "noEmit": true, + "allowImportingTsExtensions": true, + "outDir": null, + "declarationDir": null, + "declaration": false + }, + "include": ["scripts", "starters/dev-server.ts"], + "exclude": [] +}