@qwik.dev/router 2.0.0-beta.45 → 2.0.0-beta.47

package/lib/vite/index.mjs

@@ -1,7 +1,8 @@
 import { r as isSameOriginUrl, t as ensureSlash } from "../chunks/pathname.mjs";
 import { c as resolveValidInternalFullPathname, s as recognizeRequest, u as trimRecognizedInternalPathname } from "../chunks/request-path.mjs";
+import { t as escapeStaticTrieKey } from "../chunks/route-trie-key.mjs";
 import { n as addWarning, t as addError } from "../chunks/format.mjs";
-import { _ as normalizePath$1, a as getPathnameFromDirPath, b as parseRouteIndexName, c as isIndexModule, d as isMenuFileName, f as isModuleExt, g as isServiceWorkerName, h as isPluginModule, i as getMenuPathname, l as isLayoutModule, m as isPageModuleExt, n as errorBoundaryName, o as isEntryName, p as isPageExt, r as getExtension, s as isErrorName, t as createFileId, u as isMarkdownExt, v as normalizePathKey, x as removeExtension } from "../chunks/fs.mjs";
+import { _ as normalizePath$1, a as getPathnameFromDirPath, b as parseRouteIndexName, c as isIndexModule, d as isMenuFileName, f as isModuleExt, g as isServiceWorkerName, h as isPluginModule, i as getMenuPathname, l as isLayoutModule, m as isPageModuleExt, n as createFileId, o as isEntryName, p as isPageExt, r as getExtension, s as isErrorName, t as caughtErrorName, u as isMarkdownExt, v as normalizePathKey, x as removeExtension } from "../chunks/fs.mjs";
 import { t as devPreloadedRouteLoaders } from "../chunks/dev-preloaded-route-loader.mjs";
 import { t as createRouteTester } from "../chunks/routes.mjs";
 import fs, { existsSync } from "node:fs";
@@ -31,7 +32,6 @@ function extendConfig(baseConfigExport, serverConfigExport) {
 		return mergeConfig(resolvedBase, resolvedServer);
 	};
 }
-var sw_register_build_default = "export default\"\"";
 function getSourceFile(fileName) {
 	const ext = getExtension(fileName);
 	const extlessName = removeExtension(fileName);
@@ -220,7 +220,7 @@ function resolveRoute(opts, appLayouts, sourceFile) {
 	const routesDir = opts.routesDir;
 	const { layoutName, layoutStop } = parseRouteIndexName(sourceFile.extlessName);
 	let pathname = getPathnameFromDirPath(opts, sourceFile.dirPath);
-	const boundary = errorBoundaryName(sourceFile.extlessName);
+	const boundary = caughtErrorName(sourceFile.extlessName);
 	if (boundary) pathname += boundary + ".html";
 	if (!layoutStop) {
 		let currentDir = normalizePath$1(dirname(filePath));
@@ -978,6 +978,14 @@ function getImportPath(importPath) {
 function isGroupKey(key) {
 	return key.charCodeAt(0) === 40;
 }
+/** The runtime trie key for a build trie key; `_W`/`_A` are the only non-static ones. */
+function toRuntimeTrieKey(key) {
+	return key === "_W" || key === "_A" ? key : escapeStaticTrieKey(key);
+}
+/** A rewrite target or base path with each segment converted to its runtime trie key. */
+function toRuntimeTriePath(path) {
+	return path.split("/").map(toRuntimeTrieKey).join("/");
+}
 /**
 * Serialize the build trie into JS code.
 *
@@ -1053,7 +1061,7 @@ function createRoutes(ctx, qwikPlugin, c, esmImports, isSSR, loadersByFile, serv
 	const trieStr = serializeBuildTrie(ctx, qwikPlugin, ctx.routeTrie, layoutIdMap, routeIdMap, menuIdMap, isSSR, "", loadersByFile, routeLoaderSourceFiles);
 	const baseSegments = ctx.opts.basePathname.split("/").filter((s) => s.length > 0);
 	let routesExpr = trieStr;
-	for (let j = baseSegments.length - 1; j >= 0; j--) routesExpr = `{ ${JSON.stringify(baseSegments[j])}: ${routesExpr} }`;
+	for (let j = baseSegments.length - 1; j >= 0; j--) routesExpr = `{ ${JSON.stringify(escapeStaticTrieKey(baseSegments[j]))}: ${routesExpr} }`;
 	c.push(`export const routes = ${routesExpr};`);
 }
 function collectFiles(node, cb) {
@@ -1067,7 +1075,10 @@ function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menu
 	if (node._P) lines.push(`${nextIndent}_P: ${JSON.stringify(node._P)},`);
 	if (node._0) lines.push(`${nextIndent}_0: ${JSON.stringify(node._0)},`);
 	if (node._9) lines.push(`${nextIndent}_9: ${JSON.stringify(node._9)},`);
-	if (node._G != null) lines.push(`${nextIndent}_G: ${JSON.stringify(ctx.opts.basePathname + node._G)},`);
+	if (node._G != null) {
+		const target = toRuntimeTriePath(ctx.opts.basePathname + node._G);
+		lines.push(`${nextIndent}_G: ${JSON.stringify(target)},`);
+	}
 	let layoutExpr;
 	let indexExpr;
 	let errorExpr;
@@ -1090,7 +1101,7 @@ function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menu
 		if (!loaderExpr) continue;
 		const route = ctx.routes.find((route) => route.filePath === file.filePath);
 		const expr = buildLoaderChainExpr(file.extlessName, loaderExpr, route?.layouts ?? []);
-		const boundary = errorBoundaryName(file.extlessName);
+		const boundary = caughtErrorName(file.extlessName);
 		if (boundary === "404") notFoundExpr = expr;
 		else if (boundary === "error") errorExpr = expr;
 		else {
@@ -1143,7 +1154,7 @@ function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menu
 	for (const [key, child] of regularChildren) {
 		const childStr = serializeBuildTrie(ctx, qwikPlugin, child, layoutIdMap, routeIdMap, menuIdMap, isSSR, nextIndent, loadersByFile, routeLoaderSourceFiles);
 		if (childStr !== "{}") {
-			const keyStr = JSON.stringify(key);
+			const keyStr = JSON.stringify(toRuntimeTrieKey(key));
 			lines.push(`${nextIndent}${keyStr}: ${childStr},`);
 		}
 	}
@@ -1193,38 +1204,44 @@ function createServerPlugins(ctx, _qwikPlugin, c, esmImports, isSSR) {
 	}
 	c.push(`];`);
 }
+/** The URL of the app's service worker entry, when the routes define one. */
+function resolveServiceWorkerUrl(ctx) {
+	if (ctx.serviceWorkers.length === 0) return;
+	const sw = ctx.serviceWorkers.sort((a, b) => a.chunkFileName.length < b.chunkFileName.length ? -1 : 1)[0];
+	return ctx.opts.basePathname + sw.chunkFileName;
+}
+/** The `@qwik-router-sw-register` module, kept for apps that import it themselves. */
+function generateServiceWorkerRegister(ctx) {
+	return `import { _getServiceWorkerScript } from '@qwik.dev/router';\nexport default _getServiceWorkerScript(${JSON.stringify(resolveServiceWorkerUrl(ctx))});\n`;
+}
 /** Generates the Qwik Router Config runtime code */
 function generateQwikRouterConfig(ctx, qwikPlugin, isSSR, loadersByFile, serverExcludePaths, routeLoaderSourceFiles) {
 	const esmImports = [];
 	const c = [];
 	c.push(`\n/** Qwik Router Config */`);
 	c.push(`\nimport { isDev } from '@qwik.dev/core/build';`);
-	if (isSSR) esmImports.push(`import { importEagerModules } from 'virtual:qwik-router-server-fns';`, `export { importEagerModules } from 'virtual:qwik-router-server-fns';`);
+	if (isSSR) esmImports.push(`import { importEagerModules } from 'virtual:qwik-router-server-fns';`, `export { importEagerModules } from 'virtual:qwik-router-server-fns';`, `import { _setRouterConfig } from '@qwik.dev/router';`);
 	createServerPlugins(ctx, qwikPlugin, c, esmImports, isSSR);
 	createRoutes(ctx, qwikPlugin, c, esmImports, isSSR, loadersByFile, serverExcludePaths, routeLoaderSourceFiles);
 	createEntries(ctx, c);
-	c.push(`export const trailingSlash = ${JSON.stringify(!globalThis.__NO_TRAILING_SLASH__)};`);
+	c.push(`export const trailingSlash = !globalThis.__NO_TRAILING_SLASH__;`);
 	c.push(`export const basePathname = ${JSON.stringify(ctx.opts.basePathname)};`);
 	c.push(`export const cacheModules = !isDev;`);
-	if (isSSR) c.push(`export default { routes, serverPlugins, trailingSlash, basePathname, cacheModules, importEagerModules };`);
-	else c.push(`export default { routes, serverPlugins, trailingSlash, basePathname, cacheModules };`);
+	c.push(`export const serviceWorkerUrl = ${JSON.stringify(resolveServiceWorkerUrl(ctx))};`);
+	const fields = [
+		"routes",
+		"serverPlugins",
+		"trailingSlash",
+		"basePathname",
+		"cacheModules",
+		"serviceWorkerUrl"
+	];
+	if (isSSR) fields.push("importEagerModules");
+	c.push(`const config = { ${fields.join(", ")} };`);
+	c.push(`export default config;`);
+	if (isSSR) c.push(`_setRouterConfig(config);`);
 	return esmImports.join("\n") + c.join("\n");
 }
-function generateServiceWorkerRegister(ctx, swRegister) {
-	let swReg;
-	let swUrl = "/service-worker.js";
-	if (ctx.serviceWorkers.length === 0) swReg = SW_UNREGISTER;
-	else {
-		swReg = swRegister;
-		const sw = ctx.serviceWorkers.sort((a, b) => a.chunkFileName.length < b.chunkFileName.length ? -1 : 1)[0];
-		swUrl = ctx.opts.basePathname + sw.chunkFileName;
-	}
-	swReg = swReg.replace("__url", swUrl);
-	return `export default ${JSON.stringify(swReg)};`;
-}
-var SW_UNREGISTER = `
-"serviceWorker"in navigator&&navigator.serviceWorker.getRegistrations().then(r=>{for(const e of r){const c='__url'.split("/").pop();e.active?.scriptURL.endsWith(c||"service-worker.js")&&e.unregister().catch(console.error)}}),"caches"in window&&caches.keys().then(r=>{const e=r.find(c=>c.startsWith("QwikBuild"));e&&caches.delete(e).catch(console.error)}).catch(console.error)
-`;
 /**
 * Non-GET RouteModule handlers keep a route server-side (onGet is served statically). Typed against
 * keyof RouteModule so a renamed/added handler fails to compile until classified.
@@ -1933,7 +1950,6 @@ var makeRouterDevMiddleware = (server, ctx) => async (req, res, next) => {
 		res.end("/* Qwik Router Dev Service Worker */self.addEventListener('install', () => self.skipWaiting());self.addEventListener('activate', (ev) => ev.waitUntil(self.clients.claim()));");
 		return;
 	}
-	globalThis.__qwik = void 0;
 	const { createQwikRouter } = await server.ssrLoadModule("@qwik.dev/router/middleware/node");
 	try {
 		const render = (async (opts) => {
@@ -2004,6 +2020,14 @@ var CSS_EXTENSIONS = [
 var JS_EXTENSIONS = /\.[mc]?[tj]sx?$/;
 var isCssPath = (url) => CSS_EXTENSIONS.some((ext) => url.endsWith(ext));
 /**
+* The URL the Vite dev server serves a module under. For a file, the module graph URL is already
+* one (`/src/a.css`, `/@fs/...`). A virtual module from a plugin has its id as URL, and Vite serves
+* it under `/@id/` with the `\0` written as `__x00__`, the same as Vite's own `wrapId`.
+*
+* `\0virtual:theme.css` -> `/@id/__x00__virtual:theme.css`
+*/
+var toDevServerUrl = (url) => url.startsWith("/") ? url : `/@id/${url.replace("\0", "__x00__")}`;
+/**
 * Qwik handles CSS imports itself, meaning vite doesn't get to see them, so we need to manually
 * inject the CSS URLs.
 *
@@ -2031,8 +2055,8 @@ var getCssUrls = (server) => {
 				return importerPath && JS_EXTENSIONS.test(importerPath);
 			});
 			if ((isEntryCSS || hasJSImporter) && !hasCSSImporter && !cssImportedByCSS.has(mod.url)) {
-				cssModules.add(`${mod.url}${mod.lastHMRTimestamp ? `?t=${mod.lastHMRTimestamp}` : ""}`);
-				if (mod.file) server.watcher.add(mod.file);
+				cssModules.add(`${toDevServerUrl(mod.url)}${mod.lastHMRTimestamp ? `?t=${mod.lastHMRTimestamp}` : ""}`);
+				if (mod.file && mod.url.startsWith("/")) server.watcher.add(mod.file);
 			}
 		}
 	}
@@ -2224,6 +2248,8 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
 	let reExportedRouteLoaderSources;
 	/** SSG include/exclude from the adapter (see `_setSsgRoutes`); drives the server-route prune. */
 	let ssgRoutePatterns;
+	/** Extensionless ids of the server entries that must import the generated config. */
+	let serverEntryIds = [];
 	return {
 		name: "vite-plugin-qwik-router",
 		enforce: "pre",
@@ -2336,6 +2362,7 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
 				return getRouteImports(ctx.routes, manifest);
 			});
 			outDir = config.build?.outDir;
+			serverEntryIds = getServerEntryIds(rootDir, qwikPlugin.api.getOptions().srcDir ?? void 0, config.build?.ssr, config.build?.rolldownOptions?.input);
 		},
 		async configureServer(server) {
 			devServer = server;
@@ -2410,12 +2437,16 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
 						});
 						return generateQwikRouterConfig(ctx, qwikPlugin, isServerConsumer, devServer ? loadersByFile : void 0, serverExcludePaths, reExportedRouteLoaderSources);
 					}
-					if (isSwRegister) return generateServiceWorkerRegister(ctx, sw_register_build_default);
+					if (isSwRegister) return generateServiceWorkerRegister(ctx);
 				}
 			}
 			return null;
 		},
 		async transform(code, id) {
+			if (this.environment.config.consumer === "server" && isServerEntryId(id, serverEntryIds)) return {
+				code: `${code}\nimport '${QWIK_ROUTER_CONFIG_ID}';`,
+				map: null
+			};
 			if (id.startsWith("\0")) return;
 			const ext = extname(id).toLowerCase();
 			if (ctx && (ext === ".md" || ext === ".mdx")) {
@@ -2547,4 +2578,28 @@ function serverFnsPlugin(buildContextRef) {
 		}
 	};
 }
+/**
+* The server entries: `src/entry.ssr` (what the dev server renders through) plus the configured SSR
+* build inputs, which may be virtual ids.
+*/
+function getServerEntryIds(rootDir, srcDir, buildSsr, input) {
+	const candidates = [];
+	if (srcDir) candidates.push(resolve(srcDir, "entry.ssr"));
+	if (typeof buildSsr === "string") candidates.push(buildSsr);
+	if (typeof input === "string") candidates.push(input);
+	else if (Array.isArray(input)) candidates.push(...input);
+	else if (input) candidates.push(...Object.values(input));
+	return candidates.map((candidate) => normalizeEntryId(candidate, rootDir));
+}
+function isServerEntryId(id, serverEntryIds) {
+	const entryId = normalizeEntryId(id.split("?", 1)[0], "");
+	return serverEntryIds.includes(entryId);
+}
+var isVirtualEntryId = (id) => id.startsWith("@") || id.startsWith("\0");
+/** Absolute path without its script extension, or the id itself for a virtual entry. */
+function normalizeEntryId(id, rootDir) {
+	if (isVirtualEntryId(id)) return id;
+	const absolute = rootDir ? resolve(rootDir, id) : id;
+	return normalizePath$1(absolute).replace(/\.[cm]?[jt]sx?$/, "");
+}
 export { extendConfig, qwikCity, qwikRouter };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.45",
+  "version": "2.0.0-beta.47",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@azure/functions": "3.5.1",
@@ -41,7 +41,7 @@
     "typescript": "5.9.3",
     "uvu": "0.5.6",
     "vite": "8.2.1",
-    "@qwik.dev/core": "2.0.0-beta.45"
+    "@qwik.dev/core": "2.0.0-beta.47"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -166,7 +166,7 @@
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
     "vite": ">=8 <9",
-    "@qwik.dev/core": "2.0.0-beta.45"
+    "@qwik.dev/core": "2.0.0-beta.47"
   },
   "publishConfig": {
     "access": "public"