@qwik.dev/router 2.0.0-beta.5 → 2.0.0-beta.6

package/adapters/static/vite.d.ts

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

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

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

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

@@ -1,5 +1,5 @@
 import { ServerAdapterOptions } from '../../shared/vite';
-import type { StaticGenerateRenderOptions } from '@qwik.dev/router/static';
+import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
 
 /** @beta */
 export declare function bunServerAdapter(opts?: bunServerAdapterOptions): any;
@@ -9,6 +9,6 @@ export declare interface bunServerAdapterOptions extends ServerAdapterOptions {
     name?: string;
 }
 
-export { StaticGenerateRenderOptions }
+export { SsgRenderOptions }
 
 export { }

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

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

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

@@ -1,5 +1,5 @@
 import { ServerAdapterOptions } from '../../shared/vite';
-import type { StaticGenerateRenderOptions } from '@qwik.dev/router/static';
+import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
 
 /** @public */
 export declare function cloudflarePagesAdapter(opts?: CloudflarePagesAdapterOptions): any;
@@ -22,6 +22,6 @@ export declare interface CloudflarePagesAdapterOptions extends ServerAdapterOpti
     staticPaths?: string[];
 }
 
-export { StaticGenerateRenderOptions }
+export { SsgRenderOptions }
 
 export { }

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

@@ -1,5 +1,5 @@
 import { ServerAdapterOptions } from '../../shared/vite';
-import type { StaticGenerateRenderOptions } from '@qwik.dev/router/static';
+import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
 
 /** @beta */
 export declare function denoServerAdapter(opts?: DenoServerAdapterOptions): any;
@@ -9,6 +9,6 @@ export declare interface DenoServerAdapterOptions extends ServerAdapterOptions {
     name?: string;
 }
 
-export { StaticGenerateRenderOptions }
+export { SsgRenderOptions }
 
 export { }

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

@@ -35,6 +35,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // packages/qwik-router/src/runtime/src/qwik-router-config.ts
+var trailingSlash = !globalThis.__NO_TRAILING_SLASH__;
 var basePathname = "/";
 
 // packages/qwik-router/src/adapters/netlify-edge/vite/index.ts

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

@@ -1,5 +1,5 @@
 import { ServerAdapterOptions } from '../../shared/vite';
-import type { StaticGenerateRenderOptions } from '@qwik.dev/router/static';
+import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
 
 /** @public */
 export declare function netlifyEdgeAdapter(opts?: NetlifyEdgeAdapterOptions): any;
@@ -39,6 +39,6 @@ export declare interface NetlifyEdgeAdapterOptions extends ServerAdapterOptions
     excludedPath?: string | string[];
 }
 
-export { StaticGenerateRenderOptions }
+export { SsgRenderOptions }
 
 export { }

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

@@ -1,4 +1,5 @@
 // packages/qwik-router/src/runtime/src/qwik-router-config.ts
+var trailingSlash = !globalThis.__NO_TRAILING_SLASH__;
 var basePathname = "/";
 
 // packages/qwik-router/src/adapters/netlify-edge/vite/index.ts

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

@@ -1,5 +1,5 @@
 import { ServerAdapterOptions } from '../../shared/vite';
-import type { StaticGenerateRenderOptions } from '@qwik.dev/router/static';
+import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
 
 /** @beta */
 export declare function nodeServerAdapter(opts?: NodeServerAdapterOptions): any;
@@ -9,6 +9,6 @@ export declare interface NodeServerAdapterOptions extends ServerAdapterOptions {
     name?: string;
 }
 
-export { StaticGenerateRenderOptions }
+export { SsgRenderOptions }
 
 export { }

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

@@ -30,26 +30,24 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // packages/qwik-router/src/adapters/shared/vite/index.ts
 var index_exports = {};
 __export(index_exports, {
-  NOT_FOUND_PATHS_ID: () => NOT_FOUND_PATHS_ID,
-  RESOLVED_NOT_FOUND_PATHS_ID: () => RESOLVED_NOT_FOUND_PATHS_ID,
-  RESOLVED_STATIC_PATHS_ID: () => RESOLVED_STATIC_PATHS_ID,
-  STATIC_PATHS_ID: () => STATIC_PATHS_ID,
   getParentDir: () => getParentDir,
   viteAdapter: () => viteAdapter
 });
 module.exports = __toCommonJS(index_exports);
-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("../../../middleware/request-handler/index.cjs");
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_path = require("node:path");
-async function postBuild(clientOutDir, pathName, userStaticPaths, format, cleanStatic) {
+async function postBuild(clientOutDir, serverOutDir, pathName, userStaticPaths, cleanStatic) {
   if (pathName && !pathName.endsWith("/")) {
     pathName += "/";
   }
-  const ignorePathnames = /* @__PURE__ */ new Set([pathName + "build/", pathName + "assets/"]);
+  const ignorePathnames = /* @__PURE__ */ new Set([
+    pathName + "/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/",
+    pathName + "/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/"
+  ]);
   const staticPaths = new Set(userStaticPaths.map(normalizeTrailingSlash));
   const notFounds = [];
   const loadItem = async (fsDir, fsName, pathname) => {
@@ -83,12 +81,9 @@ async function postBuild(clientOutDir, pathName, userStaticPaths, format, cleanS
   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
-  };
+  const notFoundPathsCode = createNotFoundPathsCode(pathName, notFounds);
+  const staticPathsCode = createStaticPathsCode(staticPaths);
+  await injectStatics(staticPathsCode, notFoundPathsCode, serverOutDir);
 }
 function normalizeTrailingSlash(pathname) {
   if (!pathname.endsWith("/")) {
@@ -96,7 +91,7 @@ function normalizeTrailingSlash(pathname) {
   }
   return pathname;
 }
-function createNotFoundPathsModule(basePathname, notFounds, format) {
+function createNotFoundPathsCode(basePathname, notFounds) {
   notFounds.sort((a, b) => {
     if (a[0].length > b[0].length) {
       return -1;
@@ -116,64 +111,43 @@ function createNotFoundPathsModule(basePathname, notFounds, format) {
     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");
+  return JSON.stringify(notFounds, null, 2).slice(1, -1);
 }
-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");
+function createStaticPathsCode(staticPaths) {
+  return JSON.stringify(Array.from(new Set(staticPaths)).sort()).slice(1, -1);
 }
+var injectStatics = async (staticPathsCode, notFoundPathsCode, outDir) => {
+  const promises = /* @__PURE__ */ new Set();
+  const doReplace = async (path) => {
+    const code = await import_node_fs.default.promises.readFile(path, "utf-8");
+    let replaced = false;
+    const newCode = code.replace(
+      /(['"])__QWIK_ROUTER_(STATIC_PATHS|NOT_FOUND)_ARRAY__\1/g,
+      (_, _quote, type) => {
+        replaced = true;
+        return type === "STATIC_PATHS" ? staticPathsCode : notFoundPathsCode;
+      }
+    );
+    if (replaced) {
+      await import_node_fs.default.promises.writeFile(path, newCode);
+    }
+  };
+  const walk = async (dir) => {
+    const entries = await import_node_fs.default.promises.readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        await walk((0, import_node_path.join)(dir, entry.name));
+      } else if (entry.name.endsWith("js")) {
+        const p = doReplace((0, import_node_path.join)(dir, entry.name)).finally(() => {
+          promises.delete(p);
+        });
+        promises.add(p);
+      }
+    }
+  };
+  await walk(outDir);
+  await Promise.all(promises);
+};
 
 // packages/qwik-router/src/adapters/shared/vite/index.ts
 function viteAdapter(opts) {
@@ -183,10 +157,9 @@ function viteAdapter(opts) {
   let renderModulePath = null;
   let qwikRouterConfigModulePath = null;
   let isSsrBuild = false;
-  let format = "esm";
   const outputEntries = [];
   const plugin = {
-    name: `vite-plugin-qwik-router-${opts.name}`,
+    name: `vite-plugin-qwik-router-ssg-${opts.name}`,
     enforce: "post",
     apply: "build",
     config(config) {
@@ -200,7 +173,7 @@ function viteAdapter(opts) {
       return config;
     },
     configResolved(config) {
-      var _a, _b, _c, _d;
+      var _a, _b, _c;
       isSsrBuild = !!config.build.ssr;
       if (isSsrBuild) {
         qwikRouterPlugin = config.plugins.find(
@@ -226,9 +199,21 @@ function viteAdapter(opts) {
             `"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";
-        }
+      }
+    },
+    buildStart() {
+      if (isSsrBuild && opts.ssg !== null) {
+        const { srcDir } = qwikVitePlugin.api.getOptions();
+        this.emitFile({
+          id: "@qwik-router-config",
+          type: "chunk",
+          fileName: "@qwik-router-config.js"
+        });
+        this.emitFile({
+          id: `${srcDir}/entry.ssr`,
+          type: "chunk",
+          fileName: "entry.ssr.js"
+        });
       }
     },
     generateBundle(_, bundles) {
@@ -245,23 +230,13 @@ function viteAdapter(opts) {
             }
           }
         }
-        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)) {
+        if (isSsrBuild && 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();
@@ -269,7 +244,7 @@ function viteAdapter(opts) {
           const clientPublicOutDir = qwikVitePlugin.api.getClientPublicOutDir();
           const assetsDir = qwikVitePlugin.api.getAssetsDir();
           const rootDir = qwikVitePlugin.api.getRootDir() ?? void 0;
-          if (renderModulePath && qwikRouterConfigModulePath && clientOutDir && clientPublicOutDir) {
+          if (opts.ssg !== null && renderModulePath && qwikRouterConfigModulePath && clientOutDir && clientPublicOutDir) {
             let ssgOrigin = ((_a = opts.ssg) == null ? void 0 : _a.origin) ?? opts.origin;
             if (!ssgOrigin) {
               ssgOrigin = `https://yoursite.qwik.dev`;
@@ -282,13 +257,13 @@ function viteAdapter(opts) {
             }
             try {
               ssgOrigin = new URL(ssgOrigin).origin;
-            } catch (e) {
+            } catch {
               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 staticGenerate = await import("../../../ssg/index.cjs");
             const generateOpts = {
               maxWorkers: opts.maxWorkers,
               basePathname,
@@ -308,41 +283,34 @@ function viteAdapter(opts) {
               this.error(err);
             }
             staticPaths.push(...staticGenerateResult.staticPaths);
-            const { staticPathsCode, notFoundPathsCode } = await postBuild(
+          }
+          await postBuild(
+            clientPublicOutDir,
+            serverOutDir,
+            assetsDir ? (0, import_node_path2.join)(basePathname, assetsDir) : basePathname,
+            staticPaths,
+            !!opts.cleanStaticGenerated
+          );
+          if (typeof opts.generate === "function") {
+            await opts.generate({
+              outputEntries,
+              serverOutDir,
+              clientOutDir,
               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(
-              `
+              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.
 ==============================================`
-            );
-          }
+          );
         }
       }
     }
@@ -363,16 +331,8 @@ function getParentDir(startDir, dirName) {
   }
   throw new Error(`Unable to find "${dirName}" directory from "${startDir}"`);
 }
-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`;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  NOT_FOUND_PATHS_ID,
-  RESOLVED_NOT_FOUND_PATHS_ID,
-  RESOLVED_STATIC_PATHS_ID,
-  STATIC_PATHS_ID,
   getParentDir,
   viteAdapter
 });

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

@@ -1,9 +1,9 @@
 import type { Plugin as Plugin_2 } from 'vite';
-import type { StaticGenerateRenderOptions } from '@qwik.dev/router/static';
+import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
 import type { UserConfig } from 'vite';
 
 /** @public */
-export declare interface AdapterSSGOptions extends Omit<StaticGenerateRenderOptions, 'outDir' | 'origin'> {
+export declare interface AdapterSSGOptions extends Omit<SsgRenderOptions, 'outDir' | 'origin'> {
     /** Defines routes that should be static generated. Accepts wildcard behavior. */
     include: string[];
     /**
@@ -48,9 +48,6 @@ declare interface BuildRoute extends ParsedPathname {
 /** @public */
 export declare function getParentDir(startDir: string, dirName: string): string;
 
-/** @public */
-export declare const NOT_FOUND_PATHS_ID = "@qwik-router-not-found-paths";
-
 declare interface ParsedPathname {
     routeName: string;
     pattern: RegExp;
@@ -66,12 +63,6 @@ declare interface PathnameSegmentPart {
     rest: boolean;
 }
 
-/** @public */
-export declare const RESOLVED_NOT_FOUND_PATHS_ID = "@qwik-router-not-found-paths.js";
-
-/** @public */
-export declare const RESOLVED_STATIC_PATHS_ID = "@qwik-router-static-paths.js";
-
 /** @public */
 export declare interface ServerAdapterOptions {
     /**
@@ -83,10 +74,13 @@ export declare interface ServerAdapterOptions {
     ssg?: AdapterSSGOptions | null;
 }
 
-/** @public */
-export declare const STATIC_PATHS_ID = "@qwik-router-static-paths";
-
-/** @public */
+/**
+ * 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
+ */
 export declare function viteAdapter(opts: ViteAdapterPluginOptions): Plugin_2<never>;
 
 /** @public */