@qwik.dev/router 2.0.0-beta.3 → 2.0.0-beta.30

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/azure-swa/vite/index.mjs

@@ -1,54 +1,50 @@
-// packages/qwik-router/src/adapters/azure-swa/vite/index.ts
-import fs from "node:fs";
-import { join } from "node:path";
-import { viteAdapter } from "../../shared/vite/index.mjs";
+import fs from 'node:fs';
+import { join } from 'node:path';
+import { viteAdapter } from '../../shared/vite/index.mjs';
+
 function azureSwaAdapter(opts = {}) {
-  const env = process == null ? void 0 : process.env;
+  const env = process?.env;
   return viteAdapter({
     name: "azure-swa",
-    origin: (env == null ? void 0 : env.ORIGIN) ?? (env == null ? void 0 : env.URL) ?? "https://yoursitename.region.2.azurestaticapps.net",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.region.2.azurestaticapps.net",
     ssg: opts.ssg,
     cleanStaticGenerated: true,
     async generate({ outputEntries, serverOutDir, clientPublicOutDir }) {
       const serverPackageJsonPath = join(serverOutDir, "package.json");
       const serverPackageJsonCode = `{"type":"module"}`;
-      await fs.promises.mkdir(serverOutDir, { recursive: true });
+      await fs.promises.mkdir(serverOutDir, {
+        recursive: true
+      });
       await fs.promises.writeFile(serverPackageJsonPath, serverPackageJsonCode);
-      const azureSwaModulePath = outputEntries.find(
-        (entryName) => entryName.indexOf("entry.azure-swa") === 0
-      );
+      const azureSwaModulePath = outputEntries.find((entryName) => entryName.indexOf("entry.azure-swa") === 0);
       const funcJsonPath = join(serverOutDir, "function.json");
-      const funcJson = JSON.stringify(
-        {
-          bindings: [
-            {
-              authLevel: "anonymous",
-              type: "httpTrigger",
-              direction: "in",
-              name: "req",
-              methods: [
-                "get",
-                "head",
-                "post",
-                "put",
-                "delete",
-                "connect",
-                "options",
-                "trace",
-                "patch"
-              ]
-            },
-            {
-              type: "http",
-              direction: "out",
-              name: "$return"
-            }
-          ],
-          scriptFile: azureSwaModulePath
-        },
-        null,
-        2
-      );
+      const funcJson = JSON.stringify({
+        bindings: [
+          {
+            authLevel: "anonymous",
+            type: "httpTrigger",
+            direction: "in",
+            name: "req",
+            methods: [
+              "get",
+              "head",
+              "post",
+              "put",
+              "delete",
+              "connect",
+              "options",
+              "trace",
+              "patch"
+            ]
+          },
+          {
+            type: "http",
+            direction: "out",
+            name: "$return"
+          }
+        ],
+        scriptFile: azureSwaModulePath
+      }, null, 2);
       await fs.promises.writeFile(funcJsonPath, funcJson);
       if (!fs.existsSync(join(clientPublicOutDir, "index.html"))) {
         await fs.promises.writeFile(join(clientPublicOutDir, "index.html"), "");
@@ -56,6 +52,5 @@ function azureSwaAdapter(opts = {}) {
     }
   });
 }
-export {
-  azureSwaAdapter
-};
+
+export { azureSwaAdapter };

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/bun-server/vite/index.mjs

@@ -1,10 +1,10 @@
-// packages/qwik-router/src/adapters/bun-server/vite/index.ts
-import { viteAdapter } from "../../shared/vite/index.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+
 function bunServerAdapter(opts = {}) {
-  const env = process == null ? void 0 : process.env;
+  const env = process?.env;
   return viteAdapter({
     name: opts.name || "bun-server",
-    origin: (env == null ? void 0 : env.ORIGIN) ?? (env == null ? void 0 : env.URL) ?? "https://yoursitename.qwik.dev",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.qwik.dev",
     ssg: opts.ssg,
     cleanStaticGenerated: true,
     config() {
@@ -20,6 +20,5 @@ function bunServerAdapter(opts = {}) {
     }
   });
 }
-export {
-  bunServerAdapter
-};
+
+export { bunServerAdapter };

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/cloud-run/vite/index.mjs

@@ -1,10 +1,10 @@
-// packages/qwik-router/src/adapters/cloud-run/vite/index.ts
-import { viteAdapter } from "../../shared/vite/index.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+
 function cloudRunAdapter(opts = {}) {
-  const env = process == null ? void 0 : process.env;
+  const env = process?.env;
   return viteAdapter({
     name: "cloud-run",
-    origin: (env == null ? void 0 : env.ORIGIN) ?? (env == null ? void 0 : env.URL) ?? "https://your-app-name.run.app",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://your-app-name.run.app",
     ssg: opts.ssg,
     cleanStaticGenerated: true,
     config() {
@@ -17,6 +17,5 @@ function cloudRunAdapter(opts = {}) {
     }
   });
 }
-export {
-  cloudRunAdapter
-};
+
+export { cloudRunAdapter };

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/cloudflare-pages/vite/index.mjs

@@ -1,40 +1,30 @@
-// packages/qwik-router/src/adapters/cloudflare-pages/vite/index.ts
-import fs from "node:fs";
-import { join, relative } from "node:path";
+import fs from 'node:fs';
+import { join, relative } from 'node:path';
+import { n as normalizePathSlash } from '../../../chunks/fs.mjs';
+import { viteAdapter } from '../../shared/vite/index.mjs';
 
-// packages/qwik-router/src/utils/fs.ts
-function normalizePathSlash(path) {
-  const isExtendedLengthPath = /^\\\\\?\\/.test(path);
-  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;
-}
-
-// packages/qwik-router/src/adapters/cloudflare-pages/vite/index.ts
-import { viteAdapter } from "../../shared/vite/index.mjs";
 function cloudflarePagesAdapter(opts = {}) {
-  const env = process == null ? void 0 : process.env;
+  const env = process?.env;
   return viteAdapter({
     name: "cloudflare-pages",
-    origin: (env == null ? void 0 : env.CF_PAGES_URL) ?? (env == null ? void 0 : env.ORIGIN) ?? "https://your.cloudflare.pages.dev",
+    origin: env?.CF_PAGES_URL ?? env?.ORIGIN ?? "https://your.cloudflare.pages.dev",
     ssg: opts.ssg,
     staticPaths: opts.staticPaths,
     cleanStaticGenerated: true,
     config() {
       return {
         resolve: {
-          conditions: ["webworker", "worker"]
+          conditions: [
+            "webworker",
+            "worker"
+          ]
         },
         ssr: {
           target: "webworker",
           noExternal: true,
-          external: ["node:async_hooks"]
+          external: [
+            "node:async_hooks"
+          ]
         },
         build: {
           ssr: true,
@@ -58,8 +48,13 @@ function cloudflarePagesAdapter(opts = {}) {
         }
         const routesJson = {
           version: 1,
-          include: [basePathname + "*"],
-          exclude: [pathName + "build/*", pathName + "assets/*"]
+          include: [
+            basePathname + "*"
+          ],
+          exclude: [
+            pathName + "build/*",
+            pathName + "assets/*"
+          ]
         };
         await fs.promises.writeFile(routesJsonPath, JSON.stringify(routesJson, void 0, 2));
       }
@@ -67,14 +62,10 @@ function cloudflarePagesAdapter(opts = {}) {
       const hasWorkerJs = fs.existsSync(workerJsPath);
       if (!hasWorkerJs) {
         const importPath = relative(clientOutDir, join(serverOutDir, "entry.cloudflare-pages"));
-        await fs.promises.writeFile(
-          workerJsPath,
-          `import { fetch } from "${normalizePathSlash(importPath)}"; export default { fetch };`
-        );
+        await fs.promises.writeFile(workerJsPath, `import { fetch } from "${normalizePathSlash(importPath)}"; export default { fetch };`);
       }
     }
   });
 }
-export {
-  cloudflarePagesAdapter
-};
+
+export { cloudflarePagesAdapter };

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/deno-server/vite/index.mjs

@@ -1,21 +1,26 @@
-// packages/qwik-router/src/adapters/deno-server/vite/index.ts
-import { viteAdapter } from "../../shared/vite/index.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+
 function denoServerAdapter(opts = {}) {
-  const env = process == null ? void 0 : process.env;
+  const env = process?.env;
   return viteAdapter({
     name: opts.name || "deno-server",
-    origin: (env == null ? void 0 : env.ORIGIN) ?? (env == null ? void 0 : env.URL) ?? "https://yoursitename.qwik.dev",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.qwik.dev",
     ssg: opts.ssg,
     cleanStaticGenerated: true,
     config() {
       return {
         resolve: {
-          conditions: ["webworker", "worker"]
+          conditions: [
+            "webworker",
+            "worker"
+          ]
         },
         ssr: {
           target: "webworker",
           noExternal: true,
-          external: ["node:async_hooks"]
+          external: [
+            "node:async_hooks"
+          ]
         },
         build: {
           ssr: true,
@@ -32,6 +37,5 @@ function denoServerAdapter(opts = {}) {
     }
   });
 }
-export {
-  denoServerAdapter
-};
+
+export { denoServerAdapter };

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,29 +1,30 @@
-// packages/qwik-router/src/runtime/src/qwik-router-config.ts
-var basePathname = "/";
+import fs, { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { viteAdapter, getParentDir } from '../../shared/vite/index.mjs';
 
-// packages/qwik-router/src/adapters/netlify-edge/vite/index.ts
-import fs, { existsSync } from "node:fs";
-import { join } from "node:path";
-import { getParentDir, viteAdapter } from "../../shared/vite/index.mjs";
 function netlifyEdgeAdapter(opts = {}) {
-  const env = process == null ? void 0 : process.env;
+  const env = process?.env;
   return viteAdapter({
     name: "netlify-edge",
-    origin: (env == null ? void 0 : env.ORIGIN) ?? (env == null ? void 0 : env.URL) ?? "https://yoursitename.netlify.app",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.netlify.app",
     ssg: opts.ssg,
     staticPaths: opts.staticPaths,
     cleanStaticGenerated: true,
     config(config) {
-      var _a;
-      const outDir = ((_a = config.build) == null ? void 0 : _a.outDir) || ".netlify/edge-functions/entry.netlify-edge";
+      const outDir = config.build?.outDir || ".netlify/edge-functions/entry.netlify-edge";
       return {
         resolve: {
-          conditions: ["webworker", "worker"]
+          conditions: [
+            "webworker",
+            "worker"
+          ]
         },
         ssr: {
           target: "webworker",
           noExternal: true,
-          external: ["node:async_hooks"]
+          external: [
+            "node:async_hooks"
+          ]
         },
         build: {
           ssr: true,
@@ -38,7 +39,7 @@ function netlifyEdgeAdapter(opts = {}) {
         publicDir: false
       };
     },
-    async generate({ serverOutDir }) {
+    async generate({ serverOutDir, basePathname }) {
       if (opts.functionRoutes !== false) {
         const excludedPath = [];
         if (typeof opts.excludedPath === "string") {
@@ -46,15 +47,7 @@ function netlifyEdgeAdapter(opts = {}) {
         } else if (Array.isArray(opts.excludedPath)) {
           excludedPath.push(...opts.excludedPath);
         } else {
-          excludedPath.push(
-            "/build/*",
-            "/favicon.ico",
-            "/robots.txt",
-            "/mainifest.json",
-            "/~partytown/*",
-            "/service-worker.js",
-            "/sitemap.xml"
-          );
+          excludedPath.push("/build/*", "/favicon.ico", "/robots.txt", "/mainifest.json", "/~partytown/*", "/service-worker.js", "/sitemap.xml");
         }
         const netlifyEdgeManifest = {
           functions: [
@@ -70,23 +63,16 @@ function netlifyEdgeAdapter(opts = {}) {
         const jsPath = join(serverOutDir, "entry.netlify-edge.js");
         const mjsPath = join(serverOutDir, "entry.netlify-edge.mjs");
         if (existsSync(mjsPath)) {
-          await fs.promises.writeFile(
-            jsPath,
-            [
-              `import entry_netlifyEdge from './entry.netlify-edge.mjs';`,
-              `export default entry_netlifyEdge;`
-            ].join("\n")
-          );
+          await fs.promises.writeFile(jsPath, [
+            `import entry_netlifyEdge from './entry.netlify-edge.mjs';`,
+            `export default entry_netlifyEdge;`
+          ].join("\n"));
         }
         const netlifyEdgeFnsDir = getParentDir(serverOutDir, "edge-functions");
-        await fs.promises.writeFile(
-          join(netlifyEdgeFnsDir, "manifest.json"),
-          JSON.stringify(netlifyEdgeManifest, null, 2)
-        );
+        await fs.promises.writeFile(join(netlifyEdgeFnsDir, "manifest.json"), JSON.stringify(netlifyEdgeManifest, null, 2));
       }
     }
   });
 }
-export {
-  netlifyEdgeAdapter
-};
+
+export { netlifyEdgeAdapter };

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/node-server/vite/index.mjs

@@ -1,10 +1,10 @@
-// packages/qwik-router/src/adapters/node-server/vite/index.ts
-import { viteAdapter } from "../../shared/vite/index.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+
 function nodeServerAdapter(opts = {}) {
-  const env = process == null ? void 0 : process.env;
+  const env = process?.env;
   return viteAdapter({
     name: opts.name || "node-server",
-    origin: (env == null ? void 0 : env.ORIGIN) ?? (env == null ? void 0 : env.URL) ?? "https://yoursitename.qwik.dev",
+    origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.qwik.dev",
     ssg: opts.ssg,
     cleanStaticGenerated: true,
     config() {
@@ -20,6 +20,5 @@ function nodeServerAdapter(opts = {}) {
     }
   });
 }
-export {
-  nodeServerAdapter
-};
+
+export { nodeServerAdapter };

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[];
     /**
@@ -26,7 +26,7 @@ export declare interface AdapterSSGOptions extends Omit<StaticGenerateRenderOpti
     origin?: string;
 }
 
-declare interface BuildLayout {
+declare interface BuiltLayout {
     filePath: string;
     dirPath: string;
     id: string;
@@ -34,7 +34,7 @@ declare interface BuildLayout {
     layoutName: string;
 }
 
-declare interface BuildRoute extends ParsedPathname {
+declare interface BuiltRoute extends ParsedPathname {
     /** Unique id built from its relative file system path */
     id: string;
     /** Local file system path */
@@ -42,15 +42,12 @@ declare interface BuildRoute extends ParsedPathname {
     ext: string;
     /** URL Pathname */
     pathname: string;
-    layouts: BuildLayout[];
+    layouts: BuiltLayout[];
 }
 
 /** @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 {
     /**
@@ -84,10 +75,7 @@ export declare interface ServerAdapterOptions {
 }
 
 /** @public */
-export declare const STATIC_PATHS_ID = "@qwik-router-static-paths";
-
-/** @public */
-export declare function viteAdapter(opts: ViteAdapterPluginOptions): Plugin_2<never>;
+export declare function viteAdapter(opts: ViteAdapterPluginOptions): Plugin_2<any>[];
 
 /** @public */
 declare interface ViteAdapterPluginOptions {
@@ -104,7 +92,7 @@ declare interface ViteAdapterPluginOptions {
         clientPublicOutDir: string;
         serverOutDir: string;
         basePathname: string;
-        routes: BuildRoute[];
+        routes: BuiltRoute[];
         assetsDir?: string;
         warn: (message: string) => void;
         error: (message: string) => void;