chore(build): refactor and increase sanity

now all packages only use other built packages, no source imports.

- upgrade typescript + fixups
- add a version override so the API extractor uses the same TS version
- make typescript use bundler semantics for imports
- remove most TS path overrides, keep only per-package internal ones
- change build for qwik-labs to use vite + dts plugin
- build types and api in steps: qwik, then qwik-city+qwik-react, then the rest
- change the dev server to remove workarounds
- add flag to disable vendor scan, was causing e2e issues
- some type fixes

Author: wmertens

.github/workflows/ci.yml

@@ -490,7 +490,7 @@ jobs:
 
       - name: Print QwikLabs Lib Build
         if: ${{ needs.changes.outputs.fullbuild == 'true' }}
-        run: tree packages/qwik-labs/lib/ packages/qwik-labs/lib-types/ packages/qwik-labs/vite/
+        run: tree packages/qwik-labs/lib/ packages/qwik-labs/vite/
 
       - name: Upload QwikLabs Build Artifacts
         if: ${{ needs.changes.outputs.fullbuild == 'true' }}
@@ -499,7 +499,6 @@ jobs:
           name: builderio-qwiklabs-distribution
           path: |
             packages/qwik-labs/lib/
-            packages/qwik-labs/lib-types/
             packages/qwik-labs/vite/
             packages/qwik-labs/package.json
           if-no-files-found: error
@@ -550,8 +549,7 @@ jobs:
           mkdir -p packages/eslint-plugin-qwik/dist/
           mv dist-dev-eslint-plugin-qwik/* packages/eslint-plugin-qwik/dist/
           mv builderio-qwiklabs-distribution/lib packages/qwik-labs/lib
-          mv builderio-qwiklabs-distribution/lib-types packages/qwik-labs/lib-types
-          mv builderio-qwiklabs-distribution/vite/* packages/qwik-labs/vite/
+          mv builderio-qwiklabs-distribution/vite packages/qwik-labs/vite
 
       - name: Install NPM Dependencies
         run: |

.vscode/launch.json

@@ -38,7 +38,7 @@
       "skipFiles": ["<node_internals>/**"],
       "cwd": "${workspaceFolder}/packages/docs",
       "program": "${workspaceFolder}/packages/docs/node_modules/vite/bin/vite.js",
-      "args": ["build", "-c", "adapters/cloudflare-pages/vite.config.ts"]
+      "args": ["build", "-c", "adapters/cloudflare-pages/vite.config.mts"]
     },
     {
       "type": "node",

.vscode/settings.json

@@ -8,5 +8,7 @@
     "**/.{idea,git,cache,output,temp}/**"
   ],
   "javascript.preferences.autoImportFileExcludePatterns": ["node:test"],
-  "typescript.preferences.preferTypeOnlyAutoImports": true
+  "typescript.preferences.preferTypeOnlyAutoImports": true,
+  "typescript.tsdk": "./node_modules/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true
 }

package.json

@@ -57,31 +57,32 @@
   "devDependencies": {
     "@builder.io/partytown": "^0.10.0",
     "@builder.io/qwik": "workspace:^",
+    "@builder.io/qwik-city": "workspace:^",
     "@clack/prompts": "^0.7.0",
     "@eslint/eslintrc": "^3.0.2",
     "@mdx-js/mdx": "^3.0.1",
-    "@microsoft/api-documenter": "^7.24.1",
-    "@microsoft/api-extractor": "^7.43.0",
+    "@microsoft/api-documenter": "^7.24.2",
+    "@microsoft/api-extractor": "^7.43.1",
     "@napi-rs/cli": "^2.18.0",
     "@napi-rs/triples": "^1.2.0",
     "@node-rs/helper": "^1.5.0",
     "@octokit/action": "6.0.7",
     "@playwright/test": "^1.42.1",
     "@types/brotli": "^1.3.4",
-    "@types/bun": "^1.0.10",
+    "@types/bun": "^1.1.0",
     "@types/cross-spawn": "^6.0.6",
-    "@types/eslint": "^8.56.6",
+    "@types/eslint": "^8.56.10",
     "@types/express": "^4.17.21",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.12.7",
     "@types/path-browserify": "^1.0.2",
     "@types/prompts": "^2.4.9",
-    "@types/react": "^18.2.67",
+    "@types/react": "^18.2.79",
     "@types/semver": "^7.5.8",
     "@types/which-pm-runs": "^1.0.2",
-    "@typescript-eslint/eslint-plugin": "^7.3.1",
-    "@typescript-eslint/parser": "^7.3.1",
-    "@typescript-eslint/rule-tester": "^7.3.1",
-    "@typescript-eslint/utils": "^7.3.1",
+    "@typescript-eslint/eslint-plugin": "^7.7.1",
+    "@typescript-eslint/parser": "^7.7.1",
+    "@typescript-eslint/rule-tester": "^7.7.1",
+    "@typescript-eslint/utils": "^7.7.1",
     "all-contributors-cli": "6.26.1",
     "brotli": "1.3.3",
     "commitizen": "4.3.0",
@@ -109,16 +110,17 @@
     "snoop": "^1.0.4",
     "source-map": "0.7.4",
     "svgo": "^3.2.0",
-    "syncpack": "^12.3.0",
+    "syncpack": "^12.3.1",
     "terser": "^5.29.2",
     "tsm": "^2.3.0",
-    "typescript": "5.3.3",
+    "typescript": "5.4.5",
     "undici": "*",
     "vfile": "^6.0.1",
-    "vite": "^5.1.6",
+    "vite": "^5.2.10",
     "vite-imagetools": "^6.2.9",
+    "vite-plugin-dts": "^3.9.0",
     "vite-tsconfig-paths": "^4.3.2",
-    "vitest": "^1.4.0",
+    "vitest": "^1.5.0",
     "watchlist": "0.3.1",
     "which-pm-runs": "1.1.0",
     "zod": "^3.22.4"
@@ -129,9 +131,10 @@
     "yarn": "please-use-pnpm",
     "pnpm": ">=8.6.12"
   },
-  "packageManager": "pnpm@8.15.5",
+  "packageManager": "pnpm@9.0.5",
   "pnpm": {
     "overrides": {
+      "typescript": "5.4.5",
       "vfile": "^6.0.1",
       "@supabase/realtime-js": "2.8.4"
     },
@@ -143,7 +146,7 @@
   "scripts": {
     "api.update": "tsm scripts/index.ts --tsc --api --dev",
     "build": "tsm scripts/index.ts",
-    "build.clean": "rm -rf packages/qwik/dist/ && rm -rf packages/qwik-city/lib/ && 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/lib-types/",
+    "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-wasm-copy",
@@ -201,7 +204,8 @@
     "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": "tsm scripts/update-qwik-builds.ts packages/docs && tsm scripts/update-qwik-builds.ts packages/insights; pnpm install",
+    "vitest": "vitest"
   },
   "type": "module"
 }

packages/docs/adapters/cloudflare-pages/vite.config.ts packages/docs/adapters/cloudflare-pages/vite.config.mts

@@ -1,6 +1,7 @@
 import { cloudflarePagesAdapter } from '@builder.io/qwik-city/adapters/cloudflare-pages/vite';
 import { extendConfig } from '@builder.io/qwik-city/vite';
-import baseConfig from '../../vite.config';
+// @ts-ignore
+import baseConfig from '../../vite.config.mts';
 
 export default extendConfig(baseConfig, () => {
   return {

packages/docs/package.json

@@ -22,8 +22,8 @@
     "@mui/x-data-grid": "^6.19.6",
     "@supabase/supabase-js": "^2.39.8",
     "@types/prismjs": "^1.26.3",
-    "@types/react": "^18.2.67",
-    "@types/react-dom": "^18.2.22",
+    "@types/react": "^18.2.79",
+    "@types/react-dom": "^18.2.25",
     "@unpic/core": "^0.0.42",
     "@unpic/qwik": "^0.0.38",
     "algoliasearch": "4.16.0",
@@ -46,11 +46,11 @@
     "tailwindcss": "^3.4.1",
     "terser": "^5.29.2",
     "tsm": "^2.3.0",
-    "typescript": "5.4.2",
+    "typescript": "5.4.5",
     "undici": "*",
     "valibot": "^0.29.0",
-    "vite": "^5.1.6",
-    "vite-plugin-inspect": "^0.8.3",
+    "vite": "^5.2.10",
+    "vite-plugin-inspect": "^0.8.4",
     "wrangler": "^3.30.1"
   },
   "engines": {
@@ -61,13 +61,12 @@
   },
   "homepage": "https://qwik.dev/",
   "license": "MIT",
-  "packageManager": "pnpm@8.14.0",
   "private": true,
   "scripts": {
     "build": "qwik build",
     "build.client": "vite build",
     "build.preview": "vite build --ssr src/entry.preview.tsx",
-    "build.server": "vite build -c adapters/cloudflare-pages/vite.config.ts",
+    "build.server": "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",

packages/docs/src/routes/api/qwik-city-middleware-cloudflare-pages/api.json

@@ -12,7 +12,7 @@
         }
       ],
       "kind": "Function",
-      "content": "```typescript\nexport declare function createQwikCity(opts: QwikCityCloudflarePagesOptions): (request: PlatformCloudflarePages['request'], env: Record<string, any> & {\n    ASSETS: {\n        fetch: (req: Request) => Response;\n    };\n}, ctx: PlatformCloudflarePages['ctx']) => Promise<Response>;\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\nopts\n\n\n</td><td>\n\n[QwikCityCloudflarePagesOptions](#qwikcitycloudflarepagesoptions)\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>\n**Returns:**\n\n(request: [PlatformCloudflarePages](#platformcloudflarepages)<!-- -->\\['request'\\], env: Record&lt;string, any&gt; &amp; { ASSETS: { fetch: (req: Request) =&gt; Response; }; }, ctx: [PlatformCloudflarePages](#platformcloudflarepages)<!-- -->\\['ctx'\\]) =&gt; Promise&lt;Response&gt;",
+      "content": "```typescript\nexport declare function createQwikCity(opts: QwikCityCloudflarePagesOptions): (request: PlatformCloudflarePages['request'], env: PlatformCloudflarePages['env'] & {\n    ASSETS: {\n        fetch: (req: Request) => Response;\n    };\n}, ctx: PlatformCloudflarePages['ctx']) => Promise<Response>;\n```\n\n\n<table><thead><tr><th>\n\nParameter\n\n\n</th><th>\n\nType\n\n\n</th><th>\n\nDescription\n\n\n</th></tr></thead>\n<tbody><tr><td>\n\nopts\n\n\n</td><td>\n\n[QwikCityCloudflarePagesOptions](#qwikcitycloudflarepagesoptions)\n\n\n</td><td>\n\n\n</td></tr>\n</tbody></table>\n**Returns:**\n\n(request: [PlatformCloudflarePages](#platformcloudflarepages)<!-- -->\\['request'\\], env: [PlatformCloudflarePages](#platformcloudflarepages)<!-- -->\\['env'\\] &amp; { ASSETS: { fetch: (req: Request) =&gt; Response; }; }, ctx: [PlatformCloudflarePages](#platformcloudflarepages)<!-- -->\\['ctx'\\]) =&gt; Promise&lt;Response&gt;",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik-city/middleware/cloudflare-pages/index.ts",
       "mdFile": "qwik-city.createqwikcity.md"
     },

packages/docs/src/routes/api/qwik-city-middleware-cloudflare-pages/index.md

@@ -9,7 +9,7 @@ title: \@builder.io/qwik-city/middleware/cloudflare-pages API Reference
 ```typescript
 export declare function createQwikCity(opts: QwikCityCloudflarePagesOptions): (
   request: PlatformCloudflarePages["request"],
-  env: Record<string, any> & {
+  env: PlatformCloudflarePages["env"] & {
     ASSETS: {
       fetch: (req: Request) => Response;
     };
@@ -45,7 +45,7 @@ opts
 </tbody></table>
 **Returns:**
 
-(request: [PlatformCloudflarePages](#platformcloudflarepages)['request'], env: Record&lt;string, any&gt; &amp; { ASSETS: { fetch: (req: Request) =&gt; Response; }; }, ctx: [PlatformCloudflarePages](#platformcloudflarepages)['ctx']) =&gt; Promise&lt;Response&gt;
+(request: [PlatformCloudflarePages](#platformcloudflarepages)['request'], env: [PlatformCloudflarePages](#platformcloudflarepages)['env'] &amp; { ASSETS: { fetch: (req: Request) =&gt; Response; }; }, ctx: [PlatformCloudflarePages](#platformcloudflarepages)['ctx']) =&gt; Promise&lt;Response&gt;
 
 [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik-city/middleware/cloudflare-pages/index.ts)
 

packages/docs/src/routes/api/qwik-city/api.json

@@ -796,7 +796,7 @@
         }
       ],
       "kind": "Function",
-      "content": "Returns the document head for the current page. The generic type describes the front matter.\n\n\n```typescript\nuseDocumentHead: <FrontMatter extends Record<string, unknown> = Record<string, any>>() => Required<Required<import(\"./types\").DocumentHeadValue<FrontMatter>>>\n```\n**Returns:**\n\nRequired&lt;Required&lt;import(\"./types\").[DocumentHeadValue](#documentheadvalue)<!-- -->&lt;FrontMatter&gt;&gt;&gt;",
+      "content": "Returns the document head for the current page. The generic type describes the front matter.\n\n\n```typescript\nuseDocumentHead: <FrontMatter extends Record<string, unknown> = Record<string, any>>() => Required<ResolvedDocumentHead<FrontMatter>>\n```\n**Returns:**\n\nRequired&lt;[ResolvedDocumentHead](#resolveddocumenthead)<!-- -->&lt;FrontMatter&gt;&gt;",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik-city/runtime/src/use-functions.ts",
       "mdFile": "qwik-city.usedocumenthead.md"
     },

packages/docs/src/routes/api/qwik-city/index.md

@@ -2328,12 +2328,12 @@ Returns the document head for the current page. The generic type describes the f
 ```typescript
 useDocumentHead: <
   FrontMatter extends Record<string, unknown> = Record<string, any>,
->() => Required<Required<import("./types").DocumentHeadValue<FrontMatter>>>;
+>() => Required<ResolvedDocumentHead<FrontMatter>>;
 ```
 
 **Returns:**
 
-Required&lt;Required&lt;import("./types").[DocumentHeadValue](#documentheadvalue)&lt;FrontMatter&gt;&gt;&gt;
+Required&lt;[ResolvedDocumentHead](#resolveddocumenthead)&lt;FrontMatter&gt;&gt;
 
 [Edit this section](https://github.com/QwikDev/qwik/tree/main/packages/qwik-city/runtime/src/use-functions.ts)
 

packages/docs/src/routes/demo/tsconfig.json

@@ -9,7 +9,7 @@
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "resolveJsonModule": true,
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "esModuleInterop": true,
     "skipLibCheck": true,
     "incremental": true,

packages/docs/src/routes/docs/(qwik)/components/overview/index.mdx

@@ -380,17 +380,18 @@ bundled with the parent component.
 
 ## Polymorphic components
 
-When you want to output a different type of element depending on props, you can do it using something like this:
+When you want to output a different type of element depending on props but default to a `<div>`, you can do it using something like this:
 
 ```tsx
-export const Poly = component$(
-  <C extends string | FunctionComponent = string | FunctionComponent>({
-    as: Cmp = 'div' as C,
-    ...props
-  }: { as?: C } & PropsOf<string extends C ? 'div' : C>) => {
-    return <Cmp {...props}>hi</Cmp>;
-  }
-);
+    const Poly = component$(
+      <C extends string | FunctionComponent = 'div'>({
+        as,
+        ...props
+      }: { as?: C } & PropsOf<string extends C ? 'div' : C>) => {
+        const Cmp = as || 'div';
+        return <Cmp {...props}>hi</Cmp>;
+      }
+    );
 
 // These all work with correct types
 <>

packages/docs/src/routes/playground/index!.tsx

@@ -7,7 +7,6 @@ import playgroundApp from '@playground-data';
 import type { ReplAppInput } from '../../repl/types';
 import { createPlaygroundShareUrl, parsePlaygroundShareUrl } from '../../repl/repl-share-url';
 import { PanelToggle } from '../../components/panel-toggle/panel-toggle';
-import type { QwikPointerEvent } from 'packages/qwik/src/core/render/jsx/types/jsx-qwik-events';
 import { isBrowser } from '@builder.io/qwik/build';
 
 export default component$(() => {
@@ -66,7 +65,7 @@ export default component$(() => {
     store.colResizeActive = true;
   });
 
-  const pointerMove = $((ev: QwikPointerEvent) => {
+  const pointerMove = $((ev: PointerEvent) => {
     if (store.colResizeActive) {
       store.colLeft = (ev.clientX, ev.clientX / window.innerWidth) * 100;
       store.colLeft = Math.max(25, store.colLeft);

packages/docs/src/routes/plugin@builder.io-redirect.ts

@@ -1,4 +1,4 @@
-import type { RequestHandler } from '@builder.io/qwik-city/middleware/request-handler/types';
+import type { RequestHandler } from '@builder.io/qwik-city/middleware/request-handler';
 
 /**
  * @file

packages/docs/tsconfig.json

@@ -8,16 +8,18 @@
     "jsx": "react-jsx",
     "allowArbitraryExtensions": true,
     "jsxImportSource": "@builder.io/qwik",
-    "declaration": true,
-    "outDir": "./dist-dev/tsc-out",
-    "declarationDir": "./dist-dev/dts-out",
+    "noEmit": true,
     "strict": true,
     "verbatimModuleSyntax": true,
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "baseUrl": ".",
     "assumeChangesOnlyAffectDirectDependencies": true,
     "noUnusedLocals": true,
-    "paths": {},
+    "paths": {
+      "@examples-data": ["src/routes/examples/apps/examples-data.ts"],
+      "@playground-data": ["src/routes/playground/playground-data.ts"],
+      "@tutorial-data": ["src/routes/tutorial/tutorial-data.ts"]
+    },
     "types": ["node", "vite/client"],
     "esModuleInterop": true,
     "sourceRoot": ".",

packages/docs/vite.config.ts packages/docs/vite.config.mts

@@ -10,6 +10,7 @@ import { examplesData, playgroundData, tutorialData } from './vite.repl-apps';
 import { sourceResolver } from './vite.source-resolver';
 
 export const PUBLIC_QWIK_INSIGHT_KEY = loadEnv('', '.', 'PUBLIC').PUBLIC_QWIK_INSIGHTS_KEY;
+const docsDir = new URL(import.meta.url).pathname;
 
 export default defineConfig(async () => {
   const { default: rehypePrettyCode } = await import('rehype-pretty-code');
@@ -118,10 +119,10 @@ export default defineConfig(async () => {
       examplesData(routesDir),
       playgroundData(routesDir),
       tutorialData(routesDir),
-      sourceResolver(resolve('.')),
+      sourceResolver(docsDir),
       qwikReact(),
       Inspect(),
-      qwikInsights({ publicApiKey: loadEnv('', '.', '').PUBLIC_QWIK_INSIGHTS_KEY }),
+      qwikInsights({ publicApiKey: loadEnv('', docsDir, '').PUBLIC_QWIK_INSIGHTS_KEY }),
     ],
     build: {
       sourcemap: true,

packages/eslint-plugin-qwik/package.json

@@ -9,10 +9,11 @@
   },
   "devDependencies": {
     "@builder.io/qwik": "workspace:^",
-    "@types/eslint": "^8.56.6",
+    "@builder.io/qwik-city": "workspace:^",
+    "@types/eslint": "^8.56.10",
     "@types/estree": "^1.0.2",
-    "@typescript-eslint/rule-tester": "^7.3.1",
-    "@typescript-eslint/utils": "^7.3.1",
+    "@typescript-eslint/rule-tester": "^7.7.1",
+    "@typescript-eslint/utils": "^7.7.1",
     "redent": "^4.0.0"
   },
   "engines": {

packages/eslint-plugin-qwik/tests/tsconfig.json

@@ -10,7 +10,7 @@
     "declaration": true,
     "isolatedModules": true,
     "strict": true,
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "baseUrl": ".",
     "noUnusedLocals": false,
     "esModuleInterop": true,
@@ -19,13 +19,7 @@
     "inlineSources": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
-    "noEmit": true,
-    "paths": {
-      "@builder.io/qwik": ["../../qwik/dist/core.d.ts"],
-      "@builder.io/qwik/build": ["../../qwik/dist/build/index.d.ts"],
-      "@builder.io/qwik/jsx-runtime": ["../../qwik/dist/jsx-runtime.d.ts"],
-      "@builder.io/qwik-city": ["../../qwik-city/lib/index.d.ts"]
-    }
+    "noEmit": true
   },
   "include": ["**/*.tsx", "**/*.ts"]
 }