Merge pull request #7980 from QwikDev/v2-refactor-routerconfig

refactor(router): better naming for routing context

Author: wmertens

.github/workflows/ci.yml

@@ -286,7 +286,7 @@ jobs:
 
       - run: pnpm install
       - if: matrix.settings.wasm
-        run: pnpm install wasm-pack
+        run: pnpm install -w wasm-pack
 
       - name: Lint check
         if: matrix.settings.wasm

package.json

@@ -143,22 +143,22 @@
     "prettier-plugin-tailwindcss": "0.6.14",
     "pretty-quick": "4.2.2",
     "prompts": "2.4.2",
-    "rollup": "4.52.3",
+    "rollup": "4.52.4",
     "semver": "7.7.2",
     "simple-git-hooks": "2.13.1",
     "snoop": "1.0.4",
     "source-map": "0.7.6",
     "svgo": "3.3.2",
     "syncpack": "13.0.4",
-    "terser": "5.43.1",
+    "terser": "5.44.0",
     "tmp": "0.2.5",
     "tree-kill": "1.2.2",
-    "tsx": "4.20.5",
-    "typescript": "5.9.2",
-    "typescript-eslint": "8.41.0",
+    "tsx": "4.20.6",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.45.0",
     "vfile": "6.0.3",
-    "vite": "7.1.7",
-    "vite-imagetools": "8.0.0",
+    "vite": "7.1.9",
+    "vite-imagetools": "9.0.0",
     "vite-plugin-dts": "4.5.4",
     "vite-tsconfig-paths": "5.1.4",
     "vitest": "3.2.4",

packages/docs/package.json

@@ -20,7 +20,7 @@
     "@qwik.dev/partytown": "0.11.2",
     "@qwik.dev/react": "workspace:*",
     "@qwik.dev/router": "workspace:*",
-    "@rolldown/browser": "1.0.0-beta.36",
+    "@rolldown/browser": "1.0.0-beta.41",
     "@shikijs/colorized-brackets": "3.12.2",
     "@shikijs/langs": "3.12.2",
     "@shikijs/rehype": "3.12.2",
@@ -51,11 +51,11 @@
     "shiki": "3.12.2",
     "snarkdown": "2.0.0",
     "tailwindcss": "4.1.12",
-    "terser": "5.43.1",
+    "terser": "5.44.0",
     "tsm": "2.3.0",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
     "valibot": "0.33.3",
-    "vite": "7.1.7",
+    "vite": "7.1.9",
     "vite-plugin-inspect": "11.3.3",
     "vite-tsconfig-paths": "5.1.4",
     "wrangler": "3.65.1"

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

@@ -796,7 +796,7 @@
         }
       ],
       "kind": "TypeAlias",
-      "content": "```typescript\nexport type RouteData = [routeName: string, loaders: ModuleLoader[]] | [\n    routeName: string,\n    loaders: ModuleLoader[],\n    originalPathname: string,\n    routeBundleNames: string[]\n];\n```",
+      "content": "```typescript\nexport type RouteData = [\n    routeName: string,\n    moduleLoaders: ModuleLoader[]\n] | [\n    routeName: string,\n    moduleLoaders: ModuleLoader[],\n    originalPathname: string,\n    routeBundleNames: string[]\n];\n```",
       "editUrl": "https://github.com/QwikDev/qwik/tree/main/packages/qwik-router/src/runtime/src/types.ts",
       "mdFile": "router.routedata.md"
     },

packages/docs/src/routes/api/qwik-router/index.mdx

@@ -1854,10 +1854,10 @@ routeAction$: ActionConstructor;
 
 ```typescript
 export type RouteData =
-  | [routeName: string, loaders: ModuleLoader[]]
+  | [routeName: string, moduleLoaders: ModuleLoader[]]
   | [
       routeName: string,
-      loaders: ModuleLoader[],
+      moduleLoaders: ModuleLoader[],
       originalPathname: string,
       routeBundleNames: string[],
     ];

packages/insights/package.json

@@ -31,9 +31,9 @@
     "prettier": "3.6.2",
     "prettier-plugin-tailwindcss": "0.6.14",
     "tailwindcss": "4.1.12",
-    "typescript": "5.9.2",
-    "typescript-eslint": "8.41.0",
-    "vite": "7.1.7",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.45.0",
+    "vite": "7.1.9",
     "vite-tsconfig-paths": "5.1.4",
     "vitest": "3.2.4",
     "zod": "3.25.48"

packages/qwik-react/package.json

@@ -9,8 +9,8 @@
     "@types/react-dom": "19.1.7",
     "react": "19.1.1",
     "react-dom": "19.1.1",
-    "typescript": "5.9.2",
-    "vite": "7.1.7"
+    "typescript": "5.9.3",
+    "vite": "7.1.9"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"

packages/qwik-router/package.json

@@ -22,12 +22,12 @@
     "set-cookie-parser": "^2.7.1",
     "source-map": "^0.7.6",
     "svgo": "^3.3.2",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
     "valibot": ">=0.36.0 <2",
     "vfile": "6.0.3",
-    "vite-imagetools": "^8.0.0",
+    "vite-imagetools": "^9.0.0",
     "yaml": "^2.8.1",
     "zod": "^3.25.40"
   },

packages/qwik-router/src/adapters/shared/vite/index.ts

@@ -3,7 +3,7 @@ import type { StaticGenerateOptions, SsgRenderOptions } from 'packages/qwik-rout
 import type { QwikRouterPlugin } from '@qwik.dev/router/vite';
 import { basename, dirname, join, resolve } from 'node:path';
 import type { Plugin, UserConfig } from 'vite';
-import type { BuildRoute } from '../../../buildtime/types';
+import type { BuiltRoute } from '../../../buildtime/types';
 import { postBuild } from './post-build';
 
 /**
@@ -299,7 +299,7 @@ interface ViteAdapterPluginOptions {
     clientPublicOutDir: string;
     serverOutDir: string;
     basePathname: string;
-    routes: BuildRoute[];
+    routes: BuiltRoute[];
     assetsDir?: string;
     warn: (message: string) => void;
     error: (message: string) => void;

packages/qwik-router/src/adapters/shared/vite/post-build.ts

@@ -1,6 +1,6 @@
-import { getErrorHtml } from '@qwik.dev/router/middleware/request-handler';
 import fs from 'node:fs';
 import { join } from 'node:path';
+import { getErrorHtml } from '../../../middleware/request-handler/error-handler';
 
 /** Cleans the client output SSG results if needed and injects the SSG metadata into the build output */
 export async function postBuild(