@qwik.dev/router 2.0.0-beta.2 → 2.0.0-beta.21

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,12 +1,13 @@
-// 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';
+import '../../../chunks/error-handler.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 }) {
@@ -56,6 +57,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,13 @@
-// packages/qwik-router/src/adapters/bun-server/vite/index.ts
-import { viteAdapter } from "../../shared/vite/index.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.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 +23,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,13 @@
-// packages/qwik-router/src/adapters/cloud-run/vite/index.ts
-import { viteAdapter } from "../../shared/vite/index.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.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 +20,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,28 +1,14 @@
-// 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';
+import '../../../chunks/error-handler.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,
@@ -75,6 +61,5 @@ function cloudflarePagesAdapter(opts = {}) {
     }
   });
 }
-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,10 +1,13 @@
-// packages/qwik-router/src/adapters/deno-server/vite/index.ts
-import { viteAdapter } from "../../shared/vite/index.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.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() {
@@ -32,6 +35,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,21 +1,18 @@
-// 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';
+import '../../../chunks/error-handler.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"]
@@ -38,7 +35,7 @@ function netlifyEdgeAdapter(opts = {}) {
         publicDir: false
       };
     },
-    async generate({ serverOutDir }) {
+    async generate({ serverOutDir, basePathname }) {
       if (opts.functionRoutes !== false) {
         const excludedPath = [];
         if (typeof opts.excludedPath === "string") {
@@ -87,6 +84,5 @@ function netlifyEdgeAdapter(opts = {}) {
     }
   });
 }
-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,13 @@
-// packages/qwik-router/src/adapters/node-server/vite/index.ts
-import { viteAdapter } from "../../shared/vite/index.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.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 +23,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 {
     /**
@@ -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 */
@@ -104,7 +98,7 @@ declare interface ViteAdapterPluginOptions {
         clientPublicOutDir: string;
         serverOutDir: string;
         basePathname: string;
-        routes: BuildRoute[];
+        routes: BuiltRoute[];
         assetsDir?: string;
         warn: (message: string) => void;
         error: (message: string) => void;