@qwik.dev/router 2.0.0-beta.1 → 2.0.0-beta.11

package/modules.d.ts

@@ -19,20 +19,12 @@ declare module '@qwik-city-plan' {
   export { default } from '@qwik-router-config';
 }
 
-declare module '@qwik-router-not-found-paths' {
-  function getNotFound(_pathname: string): string;
-  export { getNotFound };
-}
-
 declare module '@qwik-city-not-found-paths' {
-  export * from '@qwik-router-not-found-paths';
-}
-
-declare module '@qwik-router-static-paths' {
-  function isStaticPath(method: string, url: URL): boolean;
-  export { isStaticPath };
+  /** @deprecated Use `getNotFound` from `@qwik.dev/router/middleware/request-handler` instead. */
+  export { getNotFound } from '@qwik.dev/router/middleware/request-handler';
 }
 
 declare module '@qwik-city-static-paths' {
-  export * from '@qwik-router-static-paths';
+  /** @deprecated Use `isStaticPath` from `@qwik.dev/router/middleware/request-handler` instead. */
+  export { isStaticPath } from '@qwik.dev/router/middleware/request-handler';
 }

package/package.json

@@ -1,47 +1,45 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.11",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
-    "@mdx-js/mdx": "^3",
-    "@types/mdx": "^2",
-    "source-map": "^0.7.4",
-    "svgo": "^3.3",
-    "undici": "*",
+    "@azure/functions": "3.5.1",
+    "@mdx-js/mdx": "^3.1.0",
+    "@netlify/edge-functions": "^2.17.0",
+    "@types/mdx": "^2.0.13",
+    "estree-util-value-to-estree": "^3.4.0",
+    "github-slugger": "^2.0.0",
+    "hast-util-heading-rank": "^2.1.1",
+    "hast-util-to-string": "^2.0.0",
+    "kleur": "^4.1.5",
+    "marked": "^12.0.2",
+    "mdast-util-mdx": "^3.0.0",
+    "refractor": "^4.8.1",
+    "rehype-autolink-headings": "^7.1.0",
+    "remark-frontmatter": "^5.0.0",
+    "remark-gfm": "^4.0.1",
+    "set-cookie-parser": "^2.7.1",
+    "source-map": "^0.7.6",
+    "svgo": "^3.3.2",
+    "typescript": "5.9.2",
+    "unified": "^11.0.5",
+    "unist-util-visit": "^5.0.0",
     "valibot": ">=0.36.0 <2",
-    "vfile": "6.0.2",
-    "vite": ">=5 <7",
-    "vite-imagetools": "^7.0.5",
-    "zod": "3.22.4"
+    "vfile": "6.0.3",
+    "vite-imagetools": "^8.0.0",
+    "yaml": "^2.8.1",
+    "zod": "^3.25.40"
   },
   "devDependencies": {
-    "@azure/functions": "3.5.1",
-    "@microsoft/api-extractor": "7.52.4",
-    "@netlify/edge-functions": "2.10.0",
+    "@microsoft/api-extractor": "7.52.10",
     "@types/mdast": "4.0.4",
-    "@types/node": "20.14.11",
-    "@types/refractor": "3.4.1",
+    "@types/node": "24.3.0",
+    "@types/refractor": "4.0.0",
     "@types/set-cookie-parser": "2.4.10",
-    "estree-util-value-to-estree": "3.1.2",
-    "github-slugger": "2.0.0",
-    "hast-util-heading-rank": "2.1.1",
-    "hast-util-to-string": "2.0.0",
-    "kleur": "4.1.5",
-    "marked": "12.0.2",
-    "mdast-util-mdx": "3.0.0",
-    "refractor": "4.8.1",
-    "rehype-autolink-headings": "7.1.0",
-    "remark-frontmatter": "5.0.0",
-    "remark-gfm": "4.0.0",
-    "set-cookie-parser": "2.6.0",
     "tsm": "2.3.0",
-    "typescript": "5.8.2",
-    "unified": "11.0.5",
-    "unist-util-visit": "5.0.0",
     "uvu": "0.5.6",
-    "yaml": "2.4.5",
-    "@qwik.dev/core": "2.0.0-beta.1"
+    "@qwik.dev/core": "2.0.0-beta.11"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -93,9 +91,14 @@
       "require": "./lib/adapters/shared/vite/index.cjs"
     },
     "./adapters/static/vite": {
-      "types": "./lib/adapters/static/vite/index.d.ts",
-      "import": "./lib/adapters/static/vite/index.mjs",
-      "require": "./lib/adapters/static/vite/index.cjs"
+      "types": "./lib/adapters/ssg/vite/index.d.ts",
+      "import": "./lib/adapters/ssg/vite/index.mjs",
+      "require": "./lib/adapters/ssg/vite/index.cjs"
+    },
+    "./adapters/ssg/vite": {
+      "types": "./lib/adapters/ssg/vite/index.d.ts",
+      "import": "./lib/adapters/ssg/vite/index.mjs",
+      "require": "./lib/adapters/ssg/vite/index.cjs"
     },
     "./adapters/vercel-edge/vite": {
       "types": "./lib/adapters/vercel-edge/vite/index.d.ts",
@@ -145,9 +148,14 @@
       "import": "./lib/middleware/vercel-edge/index.mjs"
     },
     "./static": {
-      "types": "./lib/static/index.d.ts",
-      "import": "./lib/static/index.mjs",
-      "require": "./lib/static/index.cjs"
+      "types": "./lib/ssg/index.d.ts",
+      "import": "./lib/ssg/index.mjs",
+      "require": "./lib/ssg/index.cjs"
+    },
+    "./ssg": {
+      "types": "./lib/ssg/index.d.ts",
+      "import": "./lib/ssg/index.mjs",
+      "require": "./lib/ssg/index.cjs"
     },
     "./vite": {
       "types": "./lib/vite/index.d.ts",
@@ -170,13 +178,15 @@
     "README.md",
     "service-worker.d.ts",
     "static.d.ts",
+    "ssg.d.ts",
     "vite.d.ts"
   ],
   "homepage": "https://qwik.dev/",
   "license": "MIT",
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
-    "vite": ">=5 <7"
+    "vite": ">=5 <8",
+    "@qwik.dev/core": "^2.0.0-beta.11"
   },
   "publishConfig": {
     "access": "public"
@@ -187,6 +197,7 @@
     "url": "https://github.com/QwikDev/qwik.git",
     "directory": "packages/qwik-router"
   },
+  "sideEffects": false,
   "type": "module",
   "types": "./lib/index.d.ts",
   "scripts": {

package/ssg.d.ts

@@ -0,0 +1,2 @@
+// re-export for typescript in old resolution mode
+export * from './lib/ssg';

package/static.d.ts

@@ -1,2 +1,2 @@
 // re-export for typescript in old resolution mode
-export * from './lib/static';
+export * from './lib/ssg';

package/lib/adapters/static/vite/index.cjs

@@ -1,368 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// packages/qwik-router/src/adapters/static/vite/index.ts
-var index_exports = {};
-__export(index_exports, {
-  staticAdapter: () => staticAdapter
-});
-module.exports = __toCommonJS(index_exports);
-
-// packages/qwik-router/src/adapters/shared/vite/index.ts
-var import_node_fs2 = __toESM(require("node:fs"), 1);
-var import_node_path2 = require("node:path");
-
-// packages/qwik-router/src/adapters/shared/vite/post-build.ts
-var import_request_handler = require("@qwik.dev/router/middleware/request-handler");
-var import_node_fs = __toESM(require("node:fs"), 1);
-var import_node_path = require("node:path");
-async function postBuild(clientOutDir, pathName, userStaticPaths, format, cleanStatic) {
-  if (pathName && !pathName.endsWith("/")) {
-    pathName += "/";
-  }
-  const ignorePathnames = /* @__PURE__ */ new Set([pathName + "build/", pathName + "assets/"]);
-  const staticPaths = new Set(userStaticPaths.map(normalizeTrailingSlash));
-  const notFounds = [];
-  const loadItem = async (fsDir, fsName, pathname) => {
-    pathname = normalizeTrailingSlash(pathname);
-    if (ignorePathnames.has(pathname)) {
-      return;
-    }
-    const fsPath = (0, import_node_path.join)(fsDir, fsName);
-    if (fsName === "index.html" || fsName === "q-data.json") {
-      if (!staticPaths.has(pathname) && cleanStatic) {
-        await import_node_fs.default.promises.unlink(fsPath);
-      }
-      return;
-    }
-    if (fsName === "404.html") {
-      const notFoundHtml = await import_node_fs.default.promises.readFile(fsPath, "utf-8");
-      notFounds.push([pathname, notFoundHtml]);
-      return;
-    }
-    const stat = await import_node_fs.default.promises.stat(fsPath);
-    if (stat.isDirectory()) {
-      await loadDir(fsPath, pathname + fsName + "/");
-    } else if (stat.isFile()) {
-      staticPaths.add(pathname + fsName);
-    }
-  };
-  const loadDir = async (fsDir, pathname) => {
-    const itemNames = await import_node_fs.default.promises.readdir(fsDir);
-    await Promise.all(itemNames.map((i) => loadItem(fsDir, i, pathname)));
-  };
-  if (import_node_fs.default.existsSync(clientOutDir)) {
-    await loadDir(clientOutDir, pathName);
-  }
-  const notFoundPathsCode = createNotFoundPathsModule(pathName, notFounds, format);
-  const staticPathsCode = createStaticPathsModule(pathName, staticPaths, format);
-  return {
-    notFoundPathsCode,
-    staticPathsCode
-  };
-}
-function normalizeTrailingSlash(pathname) {
-  if (!pathname.endsWith("/")) {
-    return pathname + "/";
-  }
-  return pathname;
-}
-function createNotFoundPathsModule(basePathname, notFounds, format) {
-  notFounds.sort((a, b) => {
-    if (a[0].length > b[0].length) {
-      return -1;
-    }
-    if (a[0].length < b[0].length) {
-      return 1;
-    }
-    if (a[0] < b[0]) {
-      return -1;
-    }
-    if (a[0] > b[0]) {
-      return 1;
-    }
-    return 0;
-  });
-  if (!notFounds.some((r) => r[0] === basePathname)) {
-    const html = (0, import_request_handler.getErrorHtml)(404, "Resource Not Found");
-    notFounds.push([basePathname, html]);
-  }
-  const c = [];
-  c.push(`const notFounds = ${JSON.stringify(notFounds, null, 2)};`);
-  c.push(`function getNotFound(p) {`);
-  c.push(`  for (const r of notFounds) {`);
-  c.push(`    if (p.startsWith(r[0])) {`);
-  c.push(`      return r[1];`);
-  c.push(`    }`);
-  c.push(`  }`);
-  c.push(`  return "Resource Not Found";`);
-  c.push(`}`);
-  if (format === "cjs") {
-    c.push("exports.getNotFound = getNotFound;");
-  } else {
-    c.push("export { getNotFound };");
-  }
-  return c.join("\n");
-}
-function createStaticPathsModule(basePathname, staticPaths, format) {
-  const assetsPath = basePathname + "assets/";
-  const baseBuildPath = basePathname + "build/";
-  const c = [];
-  c.push(
-    `const staticPaths = new Set(${JSON.stringify(
-      Array.from(new Set(staticPaths)).sort()
-    )});`
-  );
-  c.push(`function isStaticPath(method, url) {`);
-  c.push(`  if (method.toUpperCase() !== 'GET') {`);
-  c.push(`    return false;`);
-  c.push(`  }`);
-  c.push(`  const p = url.pathname;`);
-  c.push(`  if (p.startsWith(${JSON.stringify(baseBuildPath)})) {`);
-  c.push(`    return true;`);
-  c.push(`  }`);
-  c.push(`  if (p.startsWith(${JSON.stringify(assetsPath)})) {`);
-  c.push(`    return true;`);
-  c.push(`  }`);
-  c.push(`  if (staticPaths.has(p)) {`);
-  c.push(`    return true;`);
-  c.push(`  }`);
-  c.push(`  if (p.endsWith('/q-data.json')) {`);
-  c.push(`    const pWithoutQdata = p.replace(/\\/q-data.json$/, '');`);
-  c.push(`    if (staticPaths.has(pWithoutQdata + '/')) {`);
-  c.push(`      return true;`);
-  c.push(`    }`);
-  c.push(`    if (staticPaths.has(pWithoutQdata)) {`);
-  c.push(`      return true;`);
-  c.push(`    }`);
-  c.push(`  }`);
-  c.push(`  return false;`);
-  c.push(`}`);
-  if (format === "cjs") {
-    c.push("exports.isStaticPath = isStaticPath;");
-  } else {
-    c.push("export { isStaticPath };");
-  }
-  return c.join("\n");
-}
-
-// packages/qwik-router/src/adapters/shared/vite/index.ts
-function viteAdapter(opts) {
-  let qwikRouterPlugin = null;
-  let qwikVitePlugin = null;
-  let serverOutDir = null;
-  let renderModulePath = null;
-  let qwikRouterConfigModulePath = null;
-  let isSsrBuild = false;
-  let format = "esm";
-  const outputEntries = [];
-  const plugin = {
-    name: `vite-plugin-qwik-router-${opts.name}`,
-    enforce: "post",
-    apply: "build",
-    config(config) {
-      if (typeof opts.config === "function") {
-        config = opts.config(config);
-      }
-      config.define = {
-        "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV || "production"),
-        ...config.define
-      };
-      return config;
-    },
-    configResolved(config) {
-      var _a, _b, _c, _d;
-      isSsrBuild = !!config.build.ssr;
-      if (isSsrBuild) {
-        qwikRouterPlugin = config.plugins.find(
-          (p) => p.name === "vite-plugin-qwik-router"
-        );
-        if (!qwikRouterPlugin) {
-          throw new Error("Missing vite-plugin-qwik-router");
-        }
-        qwikVitePlugin = config.plugins.find(
-          (p) => p.name === "vite-plugin-qwik"
-        );
-        if (!qwikVitePlugin) {
-          throw new Error("Missing vite-plugin-qwik");
-        }
-        serverOutDir = config.build.outDir;
-        if (((_a = config.build) == null ? void 0 : _a.ssr) !== true) {
-          throw new Error(
-            `"build.ssr" must be set to "true" in order to use the "${opts.name}" adapter.`
-          );
-        }
-        if (!((_c = (_b = config.build) == null ? void 0 : _b.rollupOptions) == null ? void 0 : _c.input)) {
-          throw new Error(
-            `"build.rollupOptions.input" must be set in order to use the "${opts.name}" adapter.`
-          );
-        }
-        if (((_d = config.ssr) == null ? void 0 : _d.format) === "cjs") {
-          format = "cjs";
-        }
-      }
-    },
-    generateBundle(_, bundles) {
-      if (isSsrBuild) {
-        outputEntries.length = 0;
-        for (const fileName in bundles) {
-          const chunk = bundles[fileName];
-          if (chunk.type === "chunk" && chunk.isEntry) {
-            outputEntries.push(fileName);
-            if (chunk.name === "entry.ssr") {
-              renderModulePath = (0, import_node_path2.join)(serverOutDir, fileName);
-            } else if (chunk.name === "@qwik-router-config") {
-              qwikRouterConfigModulePath = (0, import_node_path2.join)(serverOutDir, fileName);
-            }
-          }
-        }
-        if (!renderModulePath) {
-          throw new Error(
-            'Unable to find "entry.ssr" entry point. Did you forget to add it to "build.rollupOptions.input"?'
-          );
-        }
-        if (!qwikRouterConfigModulePath) {
-          throw new Error(
-            'Unable to find "@qwik-router-config" entry point. Did you forget to add it to "build.rollupOptions.input"?'
-          );
-        }
-      }
-    },
-    closeBundle: {
-      sequential: true,
-      async handler() {
-        var _a;
-        if (isSsrBuild && opts.ssg !== null && serverOutDir && (qwikRouterPlugin == null ? void 0 : qwikRouterPlugin.api) && (qwikVitePlugin == null ? void 0 : qwikVitePlugin.api)) {
-          const staticPaths = opts.staticPaths || [];
-          const routes = qwikRouterPlugin.api.getRoutes();
-          const basePathname = qwikRouterPlugin.api.getBasePathname();
-          const clientOutDir = qwikVitePlugin.api.getClientOutDir();
-          const clientPublicOutDir = qwikVitePlugin.api.getClientPublicOutDir();
-          const assetsDir = qwikVitePlugin.api.getAssetsDir();
-          const rootDir = qwikVitePlugin.api.getRootDir() ?? void 0;
-          if (renderModulePath && qwikRouterConfigModulePath && clientOutDir && clientPublicOutDir) {
-            let ssgOrigin = ((_a = opts.ssg) == null ? void 0 : _a.origin) ?? opts.origin;
-            if (!ssgOrigin) {
-              ssgOrigin = `https://yoursite.qwik.dev`;
-            }
-            if (ssgOrigin.length > 0 && !/:\/\//.test(ssgOrigin)) {
-              ssgOrigin = `https://${ssgOrigin}`;
-            }
-            if (ssgOrigin.startsWith("//")) {
-              ssgOrigin = `https:${ssgOrigin}`;
-            }
-            try {
-              ssgOrigin = new URL(ssgOrigin).origin;
-            } catch (e) {
-              this.warn(
-                `Invalid "origin" option: "${ssgOrigin}". Using default origin: "https://yoursite.qwik.dev"`
-              );
-              ssgOrigin = `https://yoursite.qwik.dev`;
-            }
-            const staticGenerate = await import("../../../static/index.cjs");
-            const generateOpts = {
-              maxWorkers: opts.maxWorkers,
-              basePathname,
-              outDir: clientPublicOutDir,
-              rootDir,
-              ...opts.ssg,
-              origin: ssgOrigin,
-              renderModulePath,
-              qwikRouterConfigModulePath
-            };
-            const staticGenerateResult = await staticGenerate.generate(generateOpts);
-            if (staticGenerateResult.errors > 0) {
-              const err = new Error(
-                `Error while running SSG from "${opts.name}" adapter. At least one path failed to render.`
-              );
-              err.stack = void 0;
-              this.error(err);
-            }
-            staticPaths.push(...staticGenerateResult.staticPaths);
-            const { staticPathsCode, notFoundPathsCode } = await postBuild(
-              clientPublicOutDir,
-              assetsDir ? (0, import_node_path2.join)(basePathname, assetsDir) : basePathname,
-              staticPaths,
-              format,
-              !!opts.cleanStaticGenerated
-            );
-            await Promise.all([
-              import_node_fs2.default.promises.writeFile((0, import_node_path2.join)(serverOutDir, RESOLVED_STATIC_PATHS_ID), staticPathsCode),
-              import_node_fs2.default.promises.writeFile(
-                (0, import_node_path2.join)(serverOutDir, RESOLVED_NOT_FOUND_PATHS_ID),
-                notFoundPathsCode
-              )
-            ]);
-            if (typeof opts.generate === "function") {
-              await opts.generate({
-                outputEntries,
-                serverOutDir,
-                clientOutDir,
-                clientPublicOutDir,
-                basePathname,
-                routes,
-                assetsDir,
-                warn: (message) => this.warn(message),
-                error: (message) => this.error(message)
-              });
-            }
-            this.warn(
-              `
-==============================================
-Note: Make sure that you are serving the built files with proper cache headers.
-See https://qwik.dev/docs/deployments/#cache-headers for more information.
-==============================================`
-            );
-          }
-        }
-      }
-    }
-  };
-  return plugin;
-}
-var STATIC_PATHS_ID = "@qwik-router-static-paths";
-var RESOLVED_STATIC_PATHS_ID = `${STATIC_PATHS_ID}.js`;
-var NOT_FOUND_PATHS_ID = "@qwik-router-not-found-paths";
-var RESOLVED_NOT_FOUND_PATHS_ID = `${NOT_FOUND_PATHS_ID}.js`;
-
-// packages/qwik-router/src/adapters/static/vite/index.ts
-function staticAdapter(opts) {
-  return viteAdapter({
-    name: "static-generate",
-    origin: opts.origin,
-    ssg: {
-      include: ["/*"],
-      ...opts
-    }
-  });
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  staticAdapter
-});

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

@@ -1,10 +0,0 @@
-import type { StaticGenerateRenderOptions } from '../../../static';
-
-/** @public */
-export declare function staticAdapter(opts: StaticGenerateAdapterOptions): any;
-
-/** @public */
-export declare interface StaticGenerateAdapterOptions extends Omit<StaticGenerateRenderOptions, 'outDir'> {
-}
-
-export { }