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

package/lib/adapters/azure-swa/vite/index.d.ts

@@ -1,5 +1,5 @@
-import { ServerAdapterOptions } from '../../shared/vite';
-import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
+import { ServerAdapterOptions } from '../../shared/vite/index.js';
+import type { SsgRenderOptions } from '../../../ssg/index.js';
 
 /** @public */
 export declare function azureSwaAdapter(opts?: AzureSwaAdapterOptions): any;

package/lib/adapters/azure-swa/vite/index.mjs

@@ -1,7 +1,8 @@
 import { viteAdapter } from "../../shared/vite/index.mjs";
 import fs from "node:fs";
 import { join } from "node:path";
-/** @public */ function azureSwaAdapter(opts = {}) {
+/** @public */
+function azureSwaAdapter(opts = {}) {
 	const env = process?.env;
 	return viteAdapter({
 		name: "azure-swa",

package/lib/adapters/bun-server/vite/index.d.ts

@@ -1,5 +1,5 @@
-import { ServerAdapterOptions } from '../../shared/vite';
-import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
+import { ServerAdapterOptions } from '../../shared/vite/index.js';
+import type { SsgRenderOptions } from '../../../ssg/index.js';
 
 /** @beta */
 export declare function bunServerAdapter(opts?: bunServerAdapterOptions): any;

package/lib/adapters/bun-server/vite/index.mjs

@@ -1,5 +1,6 @@
 import { viteAdapter } from "../../shared/vite/index.mjs";
-/** @beta */ function bunServerAdapter(opts = {}) {
+/** @beta */
+function bunServerAdapter(opts = {}) {
 	const env = process?.env;
 	return viteAdapter({
 		name: opts.name || "bun-server",

package/lib/adapters/cloud-run/vite/index.d.ts

@@ -1,5 +1,5 @@
-import { ServerAdapterOptions } from '../../shared/vite';
-import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
+import { ServerAdapterOptions } from '../../shared/vite/index.js';
+import type { SsgRenderOptions } from '../../../ssg/index.js';
 
 /** @public */
 export declare function cloudRunAdapter(opts?: CloudRunAdapterOptions): any;

package/lib/adapters/cloud-run/vite/index.mjs

@@ -1,5 +1,6 @@
 import { viteAdapter } from "../../shared/vite/index.mjs";
-/** @public */ function cloudRunAdapter(opts = {}) {
+/** @public */
+function cloudRunAdapter(opts = {}) {
 	const env = process?.env;
 	return viteAdapter({
 		name: "cloud-run",

package/lib/adapters/cloudflare-pages/vite/index.d.ts

@@ -1,5 +1,5 @@
-import { ServerAdapterOptions } from '../../shared/vite';
-import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
+import { ServerAdapterOptions } from '../../shared/vite/index.js';
+import type { SsgRenderOptions } from '../../../ssg/index.js';
 
 /** @public */
 export declare function cloudflarePagesAdapter(opts?: CloudflarePagesAdapterOptions): any;

package/lib/adapters/cloudflare-pages/vite/index.mjs

@@ -3,7 +3,8 @@ import { viteAdapter } from "../../shared/vite/index.mjs";
 import { y as normalizePathSlash } from "../../../chunks/fs.mjs";
 import fs from "node:fs";
 import { join, relative } from "node:path";
-/** @public */ function cloudflarePagesAdapter(opts = {}) {
+/** @public */
+function cloudflarePagesAdapter(opts = {}) {
 	const env = process?.env;
 	return viteAdapter({
 		name: "cloudflare-pages",

package/lib/adapters/deno-server/vite/index.d.ts

@@ -1,5 +1,5 @@
-import { ServerAdapterOptions } from '../../shared/vite';
-import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
+import { ServerAdapterOptions } from '../../shared/vite/index.js';
+import type { SsgRenderOptions } from '../../../ssg/index.js';
 
 /** @beta */
 export declare function denoServerAdapter(opts?: DenoServerAdapterOptions): any;

package/lib/adapters/deno-server/vite/index.mjs

@@ -1,5 +1,6 @@
 import { viteAdapter } from "../../shared/vite/index.mjs";
-/** @beta */ function denoServerAdapter(opts = {}) {
+/** @beta */
+function denoServerAdapter(opts = {}) {
 	const env = process?.env;
 	return viteAdapter({
 		name: opts.name || "deno-server",

package/lib/adapters/netlify-edge/vite/index.d.ts

@@ -1,5 +1,5 @@
-import { ServerAdapterOptions } from '../../shared/vite';
-import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
+import { ServerAdapterOptions } from '../../shared/vite/index.js';
+import type { SsgRenderOptions } from '../../../ssg/index.js';
 
 /** @public */
 export declare function netlifyEdgeAdapter(opts?: NetlifyEdgeAdapterOptions): any;

package/lib/adapters/netlify-edge/vite/index.mjs

@@ -1,7 +1,8 @@
 import { getParentDir, viteAdapter } from "../../shared/vite/index.mjs";
 import fs, { existsSync } from "node:fs";
 import { join } from "node:path";
-/** @public */ function netlifyEdgeAdapter(opts = {}) {
+/** @public */
+function netlifyEdgeAdapter(opts = {}) {
 	const env = process?.env;
 	return viteAdapter({
 		name: "netlify-edge",

package/lib/adapters/node-server/vite/index.d.ts

@@ -1,5 +1,5 @@
-import { ServerAdapterOptions } from '../../shared/vite';
-import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
+import { ServerAdapterOptions } from '../../shared/vite/index.js';
+import type { SsgRenderOptions } from '../../../ssg/index.js';
 
 /** @beta */
 export declare function nodeServerAdapter(opts?: NodeServerAdapterOptions): any;

package/lib/adapters/node-server/vite/index.mjs

@@ -1,5 +1,6 @@
 import { viteAdapter } from "../../shared/vite/index.mjs";
-/** @beta */ function nodeServerAdapter(opts = {}) {
+/** @beta */
+function nodeServerAdapter(opts = {}) {
 	const env = process?.env;
 	return viteAdapter({
 		name: opts.name || "node-server",

package/lib/adapters/shared/vite/index.d.ts

@@ -1,5 +1,5 @@
 import { Plugin as Plugin_2 } from 'vite';
-import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
+import type { SsgRenderOptions } from '../../../ssg/index.js';
 import { UserConfig } from 'vite';
 
 /** @public */

package/lib/adapters/shared/vite/index.mjs

@@ -4,34 +4,8 @@ import fs from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import { spawn } from "node:child_process";
 import { readFile, rm, unlink } from "node:fs/promises";
-function createStaticPathsCode(staticPaths) {
-	return JSON.stringify(Array.from(new Set(staticPaths)).sort()).slice(1, -1);
-}
-var injectStatics = async (staticPathsCode, outDir) => {
-	const promises = /* @__PURE__ */ new Set();
-	const doReplace = async (path) => {
-		const code = await fs.promises.readFile(path, "utf-8");
-		let replaced = false;
-		const newCode = code.replace(/(['"`])__QWIK_ROUTER_STATIC_PATHS_ARRAY__\1/g, () => {
-			replaced = true;
-			return staticPathsCode;
-		});
-		if (replaced) await fs.promises.writeFile(path, newCode);
-	};
-	const walk = async (dir) => {
-		const entries = await fs.promises.readdir(dir, { withFileTypes: true });
-		for (const entry of entries) if (entry.isDirectory()) await walk(join(dir, entry.name));
-		else if (entry.name.endsWith("js")) {
-			const p = doReplace(join(dir, entry.name)).finally(() => {
-				promises.delete(p);
-			});
-			promises.add(p);
-		}
-	};
-	await walk(outDir);
-	await Promise.all(promises);
-};
-/** Cleans the client output SSG results if needed and injects the SSG metadata into the build output */ async function postBuild(clientOutDir, serverOutDir, pathName, userStaticPaths, cleanStatic, noTrailingSlash) {
+/** Cleans the client output SSG results if needed and injects the SSG metadata into the build output */
+async function postBuild(clientOutDir, serverOutDir, pathName, userStaticPaths, cleanStatic, noTrailingSlash) {
 	if (pathName && !pathName.endsWith("/")) pathName = ensureSlash(pathName);
 	const pathNameBase = pathName || "/";
 	const ignorePathnames = /* @__PURE__ */ new Set([pathNameBase + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/", pathNameBase + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"]);
@@ -66,17 +40,46 @@ var injectStatics = async (staticPathsCode, outDir) => {
 	if (fs.existsSync(clientOutDir)) await loadDir(clientOutDir, pathName);
 	await injectStatics(createStaticPathsCode(staticPaths), serverOutDir);
 }
+function createStaticPathsCode(staticPaths) {
+	return JSON.stringify(Array.from(new Set(staticPaths)).sort()).slice(1, -1);
+}
+var injectStatics = async (staticPathsCode, outDir) => {
+	const promises = /* @__PURE__ */ new Set();
+	const doReplace = async (path) => {
+		const code = await fs.promises.readFile(path, "utf-8");
+		let replaced = false;
+		const newCode = code.replace(/(['"`])__QWIK_ROUTER_STATIC_PATHS_ARRAY__\1/g, () => {
+			replaced = true;
+			return staticPathsCode;
+		});
+		if (replaced) await fs.promises.writeFile(path, newCode);
+	};
+	const walk = async (dir) => {
+		const entries = await fs.promises.readdir(dir, { withFileTypes: true });
+		for (const entry of entries) if (entry.isDirectory()) await walk(join(dir, entry.name));
+		else if (entry.name.endsWith("js")) {
+			const p = doReplace(join(dir, entry.name)).finally(() => {
+				promises.delete(p);
+			});
+			promises.add(p);
+		}
+	};
+	await walk(outDir);
+	await Promise.all(promises);
+};
 /**
 * Implements the SSG after the build is complete. Also provides a `generate(...)` callback that is
 * called after the SSG is complete, which allows for custom post-processing of the complete build
 * results.
 *
 * @public
-*/ var QWIK_SSG_ENTRY_ID = "@qwik-ssg-entry";
+*/
+var QWIK_SSG_ENTRY_ID = "@qwik-ssg-entry";
 var QWIK_SSG_ENTRY_RESOLVED = "\0@qwik-ssg-entry";
 var QWIK_SSG_WORKER_ENTRY_ID = "@qwik-ssg-worker-entry";
 var QWIK_SSG_WORKER_ENTRY_RESOLVED = "\0@qwik-ssg-worker-entry";
-/** @public */ function viteAdapter(opts) {
+/** @public */
+function viteAdapter(opts) {
 	let qwikRouterPlugin = null;
 	let qwikVitePlugin = null;
 	let viteCommand;
@@ -163,7 +166,7 @@ var QWIK_SSG_WORKER_ENTRY_RESOLVED = "\0@qwik-ssg-worker-entry";
 				basePathname,
 				rootDir,
 				...opts.ssg,
-				maxWorkers: opts.maxWorkers
+				maxWorkers: opts.maxWorkers ?? opts.ssg?.maxWorkers
 			};
 			for (const key of Object.keys(ssgOpts)) if (ssgOpts[key] === void 0) delete ssgOpts[key];
 			return [
@@ -272,7 +275,8 @@ var QWIK_SSG_WORKER_ENTRY_RESOLVED = "\0@qwik-ssg-worker-entry";
 		}
 	}];
 }
-/** @public */ function getParentDir(startDir, dirName) {
+/** @public */
+function getParentDir(startDir, dirName) {
 	const root = resolve("/");
 	let dir = startDir;
 	for (let i = 0; i < 20; i++) {

package/lib/adapters/ssg/vite/index.d.ts

@@ -1,4 +1,4 @@
-import type { SsgRenderOptions } from '../../../ssg';
+import type { SsgRenderOptions } from '../../../ssg/index.js';
 
 /** @public */
 export declare function ssgAdapter(opts: SsgAdapterOptions): any;

package/lib/adapters/ssg/vite/index.mjs

@@ -1,5 +1,6 @@
 import { viteAdapter } from "../../shared/vite/index.mjs";
-/** @public */ function ssgAdapter(opts) {
+/** @public */
+function ssgAdapter(opts) {
 	return viteAdapter({
 		name: "static-site-generation",
 		origin: opts.origin,
@@ -9,5 +10,6 @@ import { viteAdapter } from "../../shared/vite/index.mjs";
 		}
 	});
 }
-/** @public @deprecated Use `ssgAdapter` instead. */ var staticAdapter = ssgAdapter;
+/** @public @deprecated Use `ssgAdapter` instead. */
+var staticAdapter = ssgAdapter;
 export { ssgAdapter, staticAdapter };

package/lib/adapters/vercel-edge/vite/index.d.ts

@@ -1,5 +1,5 @@
-import { ServerAdapterOptions } from '../../shared/vite';
-import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
+import { ServerAdapterOptions } from '../../shared/vite/index.js';
+import type { SsgRenderOptions } from '../../../ssg/index.js';
 
 export { SsgRenderOptions }
 

package/lib/adapters/vercel-edge/vite/index.mjs

@@ -1,7 +1,8 @@
 import { getParentDir, viteAdapter } from "../../shared/vite/index.mjs";
 import fs from "node:fs";
 import { dirname, join } from "node:path";
-/** @public */ function vercelEdgeAdapter(opts = {}) {
+/** @public */
+function vercelEdgeAdapter(opts = {}) {
 	return viteAdapter({
 		name: "vercel-edge",
 		origin: process?.env?.VERCEL_URL || "https://yoursitename.vercel.app",
@@ -10,22 +11,24 @@ import { dirname, join } from "node:path";
 		cleanStaticGenerated: true,
 		config(config) {
 			const outDir = config.build?.outDir || join(".vercel", "output", "functions", "_qwik-router.func");
+			const conditions = opts.target === "node" ? [
+				"node",
+				"import",
+				"module",
+				"browser",
+				"default"
+			] : [
+				"edge-light",
+				"webworker",
+				"worker",
+				"browser",
+				"module",
+				"main"
+			];
 			return {
-				resolve: { conditions: opts.target === "node" ? [
-					"node",
-					"import",
-					"module",
-					"browser",
-					"default"
-				] : [
-					"edge-light",
-					"webworker",
-					"worker",
-					"browser",
-					"module",
-					"main"
-				] },
+				resolve: { conditions },
 				ssr: {
+					resolve: { conditions },
 					target: opts.target === "node" ? "node" : "webworker",
 					noExternal: true
 				},

package/lib/chunks/fs.mjs

@@ -15,6 +15,18 @@ function parseRouteIndexName(extlessName) {
 		layoutStop
 	};
 }
+function getPathnameFromDirPath(opts, dirPath) {
+	let pathname = normalizePath(relative(opts.routesDir, dirPath));
+	pathname = normalizePathname(pathname, opts.basePathname).split("/").filter((segment) => !isGroupedLayoutName(segment)).join("/");
+	if (pathname === "") return "/";
+	return pathname;
+}
+function getMenuPathname(opts, filePath) {
+	let pathname = normalizePath(relative(opts.routesDir, filePath));
+	pathname = `/` + normalizePath(dirname(pathname));
+	const result = normalizePathname(pathname, opts.basePathname);
+	return ensureSlash(result);
+}
 function getExtension(fileName) {
 	if (typeof fileName === "string") {
 		const parts = fileName.trim().toLowerCase().split(".");
@@ -34,30 +46,25 @@ function removeExtension(fileName) {
 	}
 	return "";
 }
-function normalizePathSlash(path) {
-	const isExtendedLengthPath = path.startsWith("\\\\?\\");
-	const hasNonAscii = /[^\u0000-\u0080]+/.test(path);
-	if (isExtendedLengthPath || hasNonAscii) return path;
-	path = path.replace(/\\/g, "/");
-	if (path.endsWith("/")) path = path.slice(0, path.length - 1);
-	return path;
-}
 function normalizePath(path) {
 	return normalizePathSlash(normalize(path));
 }
-function getMenuPathname(opts, filePath) {
-	let pathname = normalizePath(relative(opts.routesDir, filePath));
-	pathname = `/` + normalizePath(dirname(pathname));
-	const result = normalizePathname(pathname, opts.basePathname);
-	return ensureSlash(result);
-}
-/** Normalize equivalent filesystem paths for string-key comparisons. */ function normalizePathKey(path) {
+/** Normalize equivalent filesystem paths for string-key comparisons. */
+function normalizePathKey(path) {
 	if (path.startsWith("\\\\?\\UNC\\")) path = `\\\\${path.slice(8)}`;
 	else if (path.startsWith("\\\\?\\")) path = path.slice(4);
 	else if (path.startsWith("//?/UNC/")) path = `//${path.slice(8)}`;
 	else if (path.startsWith("//?/")) path = path.slice(4);
 	return normalizePath(path).replace(/\\/g, "/");
 }
+function normalizePathSlash(path) {
+	const isExtendedLengthPath = path.startsWith("\\\\?\\");
+	const hasNonAscii = /[^\u0000-\u0080]+/.test(path);
+	if (isExtendedLengthPath || hasNonAscii) return path;
+	path = path.replace(/\\/g, "/");
+	if (path.endsWith("/")) path = path.slice(0, path.length - 1);
+	return path;
+}
 /**
 * Creates an id for the module, based on its path.
 *
@@ -65,7 +72,8 @@ function getMenuPathname(opts, filePath) {
 * @param fsPath
 * @param explicitFileType Add to avoid collisions between different types of modules. `Menu` and
 *   `Layout` files are named based on their path (eg. /routes/about/menu.md => AboutMenu)
-*/ function createFileId(routesDir, fsPath, explicitFileType) {
+*/
+function createFileId(routesDir, fsPath, explicitFileType) {
 	const ids = [];
 	for (let i = 0; i < 25; i++) {
 		let baseName = removeExtension(basename(fsPath));
@@ -121,20 +129,15 @@ function isServiceWorkerName(extlessName) {
 function isEntryName(extlessName) {
 	return extlessName === "entry";
 }
-/** The boundary kind, ignoring any `@x`/`!` modifier: `'404'`, `'error'`, or undefined. */ function errorBoundaryName(extlessName) {
+/** Which caught error a page renders (`'404'` or `'error'`), ignoring `@x`/`!` modifiers. */
+function caughtErrorName(extlessName) {
 	const match = /^(error|404)(?:|!|@.+)$/.exec(extlessName);
 	return match ? match[1] : void 0;
 }
 function isErrorName(extlessName) {
-	return errorBoundaryName(extlessName) !== void 0;
+	return caughtErrorName(extlessName) !== void 0;
 }
 function isGroupedLayoutName(dirName, warn = true) {
 	return dirName.startsWith("(") && dirName.endsWith(")");
 }
-function getPathnameFromDirPath(opts, dirPath) {
-	let pathname = normalizePath(relative(opts.routesDir, dirPath));
-	pathname = normalizePathname(pathname, opts.basePathname).split("/").filter((segment) => !isGroupedLayoutName(segment)).join("/");
-	if (pathname === "") return "/";
-	return pathname;
-}
-export { normalizePath as _, getPathnameFromDirPath as a, parseRouteIndexName as b, isIndexModule as c, isMenuFileName as d, isModuleExt as f, isServiceWorkerName as g, isPluginModule as h, getMenuPathname as i, isLayoutModule as l, isPageModuleExt as m, errorBoundaryName as n, isEntryName as o, isPageExt as p, getExtension as r, isErrorName as s, createFileId as t, isMarkdownExt as u, normalizePathKey as v, removeExtension as x, normalizePathSlash as y };
+export { normalizePath as _, getPathnameFromDirPath as a, parseRouteIndexName as b, isIndexModule as c, isMenuFileName as d, isModuleExt as f, isServiceWorkerName as g, isPluginModule as h, getMenuPathname as i, isLayoutModule as l, isPageModuleExt as m, createFileId as n, isEntryName as o, isPageExt as p, getExtension as r, isErrorName as s, caughtErrorName as t, isMarkdownExt as u, normalizePathKey as v, removeExtension as x, normalizePathSlash as y };