@qwik.dev/router 2.0.0-beta.39 → 2.0.0-beta.40

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

@@ -1,17 +1,13 @@
-import { viteAdapter } from '../../shared/vite/index.mjs';
-
-function ssgAdapter(opts) {
-  return viteAdapter({
-    name: "static-site-generation",
-    origin: opts.origin,
-    ssg: {
-      include: [
-        "/*"
-      ],
-      ...opts
-    }
-  });
+import { viteAdapter } from "../../shared/vite/index.mjs";
+/** @public */ function ssgAdapter(opts) {
+	return viteAdapter({
+		name: "static-site-generation",
+		origin: opts.origin,
+		ssg: {
+			include: ["/*"],
+			...opts
+		}
+	});
 }
-const staticAdapter = ssgAdapter;
-
+/** @public @deprecated Use `ssgAdapter` instead. */ var staticAdapter = ssgAdapter;
 export { ssgAdapter, staticAdapter };

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

@@ -1,97 +1,76 @@
-import fs from 'node:fs';
-import { join, dirname } from 'node:path';
-import { viteAdapter, getParentDir } from '../../shared/vite/index.mjs';
-
-function vercelEdgeAdapter(opts = {}) {
-  return viteAdapter({
-    name: "vercel-edge",
-    origin: process?.env?.VERCEL_URL || "https://yoursitename.vercel.app",
-    ssg: opts.ssg,
-    staticPaths: opts.staticPaths,
-    cleanStaticGenerated: true,
-    config(config) {
-      const outDir = config.build?.outDir || join(".vercel", "output", "functions", "_qwik-router.func");
-      return {
-        resolve: {
-          conditions: opts.target === "node" ? [
-            "node",
-            "import",
-            "module",
-            "browser",
-            "default"
-          ] : [
-            "edge-light",
-            "webworker",
-            "worker",
-            "browser",
-            "module",
-            "main"
-          ]
-        },
-        ssr: {
-          target: opts.target === "node" ? "node" : "webworker",
-          noExternal: true
-        },
-        build: {
-          ssr: true,
-          outDir,
-          rollupOptions: {
-            output: {
-              format: "es",
-              hoistTransitiveImports: false
-            }
-          }
-        },
-        publicDir: false
-      };
-    },
-    async generate({ clientPublicOutDir, serverOutDir, basePathname, outputEntries }) {
-      const vercelOutputDir = getParentDir(serverOutDir, "output");
-      if (opts.outputConfig !== false) {
-        const vercelOutputConfig = {
-          routes: [
-            {
-              handle: "filesystem"
-            },
-            {
-              src: basePathname + ".*",
-              dest: "/_qwik-router"
-            }
-          ],
-          version: 3
-        };
-        await fs.promises.writeFile(join(vercelOutputDir, "config.json"), JSON.stringify(vercelOutputConfig, null, 2));
-      }
-      let entrypoint = opts.vcConfigEntryPoint;
-      if (!entrypoint) {
-        if (outputEntries.some((n) => n === "entry.vercel-edge.mjs")) {
-          entrypoint = "entry.vercel-edge.mjs";
-        } else {
-          entrypoint = "entry.vercel-edge.js";
-        }
-      }
-      const vcConfigPath = join(serverOutDir, ".vc-config.json");
-      const vcConfig = {
-        runtime: "edge",
-        entrypoint,
-        envVarsInUse: opts.vcConfigEnvVarsInUse
-      };
-      await fs.promises.writeFile(vcConfigPath, JSON.stringify(vcConfig, null, 2));
-      let vercelStaticDir = join(vercelOutputDir, "static");
-      const basePathnameParts = basePathname.split("/").filter((p) => p.length > 0);
-      if (basePathnameParts.length > 0) {
-        vercelStaticDir = join(vercelStaticDir, ...basePathnameParts);
-      }
-      await fs.promises.rm(vercelStaticDir, {
-        recursive: true,
-        force: true
-      });
-      await fs.promises.mkdir(dirname(vercelStaticDir), {
-        recursive: true
-      });
-      await fs.promises.rename(clientPublicOutDir, vercelStaticDir);
-    }
-  });
+import { getParentDir, viteAdapter } from "../../shared/vite/index.mjs";
+import fs from "node:fs";
+import { dirname, join } from "node:path";
+/** @public */ function vercelEdgeAdapter(opts = {}) {
+	return viteAdapter({
+		name: "vercel-edge",
+		origin: process?.env?.VERCEL_URL || "https://yoursitename.vercel.app",
+		ssg: opts.ssg,
+		staticPaths: opts.staticPaths,
+		cleanStaticGenerated: true,
+		config(config) {
+			const outDir = config.build?.outDir || join(".vercel", "output", "functions", "_qwik-router.func");
+			return {
+				resolve: { conditions: opts.target === "node" ? [
+					"node",
+					"import",
+					"module",
+					"browser",
+					"default"
+				] : [
+					"edge-light",
+					"webworker",
+					"worker",
+					"browser",
+					"module",
+					"main"
+				] },
+				ssr: {
+					target: opts.target === "node" ? "node" : "webworker",
+					noExternal: true
+				},
+				build: {
+					ssr: true,
+					outDir,
+					rolldownOptions: { output: { format: "es" } }
+				},
+				publicDir: false
+			};
+		},
+		async generate({ clientPublicOutDir, serverOutDir, basePathname, outputEntries }) {
+			const vercelOutputDir = getParentDir(serverOutDir, "output");
+			if (opts.outputConfig !== false) {
+				const vercelOutputConfig = {
+					routes: [{ handle: "filesystem" }, {
+						src: basePathname + ".*",
+						dest: "/_qwik-router"
+					}],
+					version: 3
+				};
+				await fs.promises.writeFile(join(vercelOutputDir, "config.json"), JSON.stringify(vercelOutputConfig, null, 2));
+			}
+			let entrypoint = opts.vcConfigEntryPoint;
+			if (!entrypoint) {
+				if (outputEntries.some((n) => n === "entry.vercel-edge.mjs")) entrypoint = "entry.vercel-edge.mjs";
+				else entrypoint = "entry.vercel-edge.js";
+			}
+			const vcConfigPath = join(serverOutDir, ".vc-config.json");
+			const vcConfig = {
+				runtime: "edge",
+				entrypoint,
+				envVarsInUse: opts.vcConfigEnvVarsInUse
+			};
+			await fs.promises.writeFile(vcConfigPath, JSON.stringify(vcConfig, null, 2));
+			let vercelStaticDir = join(vercelOutputDir, "static");
+			const basePathnameParts = basePathname.split("/").filter((p) => p.length > 0);
+			if (basePathnameParts.length > 0) vercelStaticDir = join(vercelStaticDir, ...basePathnameParts);
+			await fs.promises.rm(vercelStaticDir, {
+				recursive: true,
+				force: true
+			});
+			await fs.promises.mkdir(dirname(vercelStaticDir), { recursive: true });
+			await fs.promises.rename(clientPublicOutDir, vercelStaticDir);
+		}
+	});
 }
-
 export { vercelEdgeAdapter };

package/lib/chunks/dev-preloaded-route-loader.mjs

@@ -1,3 +1,2 @@
-const devPreloadedRouteLoaders = globalThis[/* @__PURE__ */ Symbol.for("devPreloadedRouteLoaders")] ??= /* @__PURE__ */ new WeakMap();
-
-export { devPreloadedRouteLoaders as d };
+var devPreloadedRouteLoaders = globalThis[Symbol.for("devPreloadedRouteLoaders")] ??= /* @__PURE__ */ new WeakMap();
+export { devPreloadedRouteLoaders as t };

package/lib/chunks/format.mjs

@@ -1,31 +1,24 @@
 function toTitleCase(str) {
-  return str.replace(/\w\S*/g, (txt) => {
-    return txt.charAt(0).toUpperCase() + txt.slice(1).toLowerCase();
-  });
+	return str.replace(/\w\S*/g, (txt) => {
+		return txt.charAt(0).toUpperCase() + txt.slice(1).toLowerCase();
+	});
 }
 function addError(ctx, e) {
-  ctx.diagnostics.push({
-    type: "error",
-    message: e ? String(e.stack || e) : "Error"
-  });
+	ctx.diagnostics.push({
+		type: "error",
+		message: e ? String(e.stack || e) : "Error"
+	});
 }
 function addWarning(ctx, message) {
-  ctx.diagnostics.push({
-    type: "warn",
-    message: String(message)
-  });
+	ctx.diagnostics.push({
+		type: "warn",
+		message: String(message)
+	});
 }
 function msToString(ms) {
-  if (ms < 1) {
-    return ms.toFixed(2) + " ms";
-  }
-  if (ms < 1e3) {
-    return ms.toFixed(1) + " ms";
-  }
-  if (ms < 6e4) {
-    return (ms / 1e3).toFixed(1) + " s";
-  }
-  return (ms / 6e4).toFixed(1) + " m";
+	if (ms < 1) return ms.toFixed(2) + " ms";
+	if (ms < 1e3) return ms.toFixed(1) + " ms";
+	if (ms < 6e4) return (ms / 1e3).toFixed(1) + " s";
+	return (ms / 6e4).toFixed(1) + " m";
 }
-
-export { addError as a, addWarning as b, msToString as m, toTitleCase as t };
+export { toTitleCase as i, addWarning as n, msToString as r, addError as t };

package/lib/chunks/fs.mjs

@@ -1,146 +1,133 @@
-import { normalize, basename, dirname, relative } from 'node:path';
-import { t as toTitleCase } from './format.mjs';
-import { n as normalizePathname, e as ensureSlash } from './pathname.mjs';
-
+import { i as normalizePathname, t as ensureSlash } from "./pathname.mjs";
+import { i as toTitleCase } from "./format.mjs";
+import { basename, dirname, normalize, relative } from "node:path";
 function parseRouteIndexName(extlessName) {
-  let layoutName = "";
-  const layoutStop = extlessName.endsWith("!");
-  if (layoutStop) {
-    extlessName = extlessName.slice(0, extlessName.length - 1);
-  }
-  const namedLayoutParts = extlessName.split("@");
-  if (namedLayoutParts.length > 1) {
-    namedLayoutParts.shift();
-    layoutName = namedLayoutParts.join("@");
-  }
-  return {
-    layoutName,
-    layoutStop
-  };
+	let layoutName = "";
+	const layoutStop = extlessName.endsWith("!");
+	if (layoutStop) extlessName = extlessName.slice(0, extlessName.length - 1);
+	const namedLayoutParts = extlessName.split("@");
+	if (namedLayoutParts.length > 1) {
+		namedLayoutParts.shift();
+		layoutName = namedLayoutParts.join("@");
+	}
+	return {
+		layoutName,
+		layoutStop
+	};
 }
 function getExtension(fileName) {
-  if (typeof fileName === "string") {
-    const parts = fileName.trim().toLowerCase().split(".");
-    if (parts.length > 1) {
-      const ext = parts.pop().split("?")[0].split("#")[0];
-      if (ext === "ts" && parts.pop() === "d") {
-        return ".d.ts";
-      }
-      return "." + ext;
-    }
-  }
-  return "";
+	if (typeof fileName === "string") {
+		const parts = fileName.trim().toLowerCase().split(".");
+		if (parts.length > 1) {
+			const ext = parts.pop().split("?")[0].split("#")[0];
+			if (ext === "ts" && parts.pop() === "d") return ".d.ts";
+			return "." + ext;
+		}
+	}
+	return "";
 }
 function removeExtension(fileName) {
-  if (typeof fileName === "string") {
-    fileName = fileName.trim();
-    const ext = getExtension(fileName);
-    return fileName.slice(0, fileName.length - ext.length);
-  }
-  return "";
+	if (typeof fileName === "string") {
+		fileName = fileName.trim();
+		const ext = getExtension(fileName);
+		return fileName.slice(0, fileName.length - ext.length);
+	}
+	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;
+	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));
+	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);
-}
-function createFileId(routesDir, fsPath, explicitFileType) {
-  const ids = [];
-  for (let i = 0; i < 25; i++) {
-    let baseName = removeExtension(basename(fsPath));
-    baseName = baseName.replace(/[\W_]+/g, "");
-    if (baseName === "") {
-      baseName = "Q" + i;
-    } else if (!isNaN(baseName.charAt(0))) {
-      baseName = "Q" + baseName;
-    }
-    ids.push(toTitleCase(baseName));
-    fsPath = normalizePath(dirname(fsPath));
-    if (fsPath === routesDir) {
-      break;
-    }
-  }
-  if (ids.length > 1 && ids[0] === "Index") {
-    ids.shift();
-  }
-  return ids.reverse().join("").concat(explicitFileType || "");
-}
-const PAGE_MODULE_EXTS = {
-  ".tsx": true,
-  ".jsx": true
+	let pathname = normalizePath(relative(opts.routesDir, filePath));
+	pathname = `/` + normalizePath(dirname(pathname));
+	const result = normalizePathname(pathname, opts.basePathname);
+	return ensureSlash(result);
+}
+/**
+* Creates an id for the module, based on its path.
+*
+* @param routesDir
+* @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) {
+	const ids = [];
+	for (let i = 0; i < 25; i++) {
+		let baseName = removeExtension(basename(fsPath));
+		baseName = baseName.replace(/[\W_]+/g, "");
+		if (baseName === "") baseName = "Q" + i;
+		else if (!isNaN(baseName.charAt(0))) baseName = "Q" + baseName;
+		ids.push(toTitleCase(baseName));
+		fsPath = normalizePath(dirname(fsPath));
+		if (fsPath === routesDir) break;
+	}
+	if (ids.length > 1 && ids[0] === "Index") ids.shift();
+	return ids.reverse().join("").concat(explicitFileType || "");
+}
+var PAGE_MODULE_EXTS = {
+	".tsx": true,
+	".jsx": true
 };
-const MODULE_EXTS = {
-  ".ts": true,
-  ".js": true
+var MODULE_EXTS = {
+	".ts": true,
+	".js": true
 };
-const MARKDOWN_EXTS = {
-  ".md": true,
-  ".mdx": true
+var MARKDOWN_EXTS = {
+	".md": true,
+	".mdx": true
 };
 function isIndexModule(extlessName) {
-  return /^index(|!|@.+)$/.test(extlessName);
+	return /^index(|!|@.+)$/.test(extlessName);
 }
 function isPluginModule(extlessName) {
-  return /^plugin(|@.+)$/.test(extlessName) && !/\.(test|unit|spec)(\.[jt]s)?$/.test(extlessName);
+	return /^plugin(|@.+)$/.test(extlessName) && !/\.(test|unit|spec)(\.[jt]s)?$/.test(extlessName);
 }
 function isLayoutModule(extlessName) {
-  return /^layout(|!|-.+)$/.test(extlessName);
+	return /^layout(|!|-.+)$/.test(extlessName);
 }
 function isPageModuleExt(ext) {
-  return ext in PAGE_MODULE_EXTS;
+	return ext in PAGE_MODULE_EXTS;
 }
 function isModuleExt(ext) {
-  return ext in MODULE_EXTS;
+	return ext in MODULE_EXTS;
 }
 function isMarkdownExt(ext) {
-  return ext in MARKDOWN_EXTS;
+	return ext in MARKDOWN_EXTS;
 }
 function isPageExt(ext) {
-  return ext in PAGE_MODULE_EXTS || ext in MARKDOWN_EXTS;
+	return ext in PAGE_MODULE_EXTS || ext in MARKDOWN_EXTS;
 }
 function isMenuFileName(fileName) {
-  return fileName === "menu.md";
+	return fileName === "menu.md";
 }
 function isServiceWorkerName(extlessName) {
-  return extlessName === "service-worker";
+	return extlessName === "service-worker";
 }
 function isEntryName(extlessName) {
-  return extlessName === "entry";
+	return extlessName === "entry";
 }
-function errorBoundaryName(extlessName) {
-  const match = /^(error|404)(?:|!|@.+)$/.exec(extlessName);
-  return match ? match[1] : void 0;
+/** The boundary kind, ignoring any `@x`/`!` modifier: `'404'`, `'error'`, or undefined. */ function errorBoundaryName(extlessName) {
+	const match = /^(error|404)(?:|!|@.+)$/.exec(extlessName);
+	return match ? match[1] : void 0;
 }
 function isErrorName(extlessName) {
-  return errorBoundaryName(extlessName) !== void 0;
+	return errorBoundaryName(extlessName) !== void 0;
 }
 function isGroupedLayoutName(dirName, warn = true) {
-  return dirName.startsWith("(") && dirName.endsWith(")");
+	return dirName.startsWith("(") && dirName.endsWith(")");
 }
 function getPathnameFromDirPath(opts, dirPath) {
-  const relFilePath = relative(opts.routesDir, dirPath);
-  let pathname = normalizePath(relFilePath);
-  pathname = normalizePathname(pathname, opts.basePathname).split("/").filter((segment) => !isGroupedLayoutName(segment)).join("/");
-  if (pathname === "") {
-    return "/";
-  }
-  return pathname;
-}
-
-export { isErrorName as a, isPageModuleExt as b, isModuleExt as c, isMarkdownExt as d, isLayoutModule as e, isEntryName as f, getExtension as g, isMenuFileName as h, isIndexModule as i, isServiceWorkerName as j, normalizePath as k, getPathnameFromDirPath as l, getMenuPathname as m, normalizePathSlash as n, createFileId as o, parseRouteIndexName as p, errorBoundaryName as q, removeExtension as r, isPluginModule as s, isPageExt as t };
+	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, removeExtension 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, normalizePathSlash as v, parseRouteIndexName as y };