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

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,61 +1,47 @@
-// packages/qwik-router/src/adapters/azure-swa/vite/index.ts
+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;
-  return viteAdapter({
-    name: "azure-swa",
-    origin: (env == null ? void 0 : env.ORIGIN) ?? (env == null ? void 0 : 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.writeFile(serverPackageJsonPath, serverPackageJsonCode);
-      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
-      );
-      await fs.promises.writeFile(funcJsonPath, funcJson);
-      if (!fs.existsSync(join(clientPublicOutDir, "index.html"))) {
-        await fs.promises.writeFile(join(clientPublicOutDir, "index.html"), "");
-      }
-    }
-  });
+/** @public */ function azureSwaAdapter(opts = {}) {
+	const env = process?.env;
+	return viteAdapter({
+		name: "azure-swa",
+		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.writeFile(serverPackageJsonPath, serverPackageJsonCode);
+			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);
+			await fs.promises.writeFile(funcJsonPath, funcJson);
+			if (!fs.existsSync(join(clientPublicOutDir, "index.html"))) await fs.promises.writeFile(join(clientPublicOutDir, "index.html"), "");
+		}
+	});
 }
-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,25 +1,18 @@
-// packages/qwik-router/src/adapters/bun-server/vite/index.ts
 import { viteAdapter } from "../../shared/vite/index.mjs";
-function bunServerAdapter(opts = {}) {
-  const env = process == null ? void 0 : 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",
-    ssg: opts.ssg,
-    cleanStaticGenerated: true,
-    config() {
-      return {
-        ssr: {
-          target: "node"
-        },
-        build: {
-          ssr: true
-        },
-        publicDir: false
-      };
-    }
-  });
+/** @beta */ function bunServerAdapter(opts = {}) {
+	const env = process?.env;
+	return viteAdapter({
+		name: opts.name || "bun-server",
+		origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.qwik.dev",
+		ssg: opts.ssg,
+		cleanStaticGenerated: true,
+		config() {
+			return {
+				ssr: { target: "node" },
+				build: { ssr: true },
+				publicDir: false
+			};
+		}
+	});
 }
-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,22 +1,17 @@
-// packages/qwik-router/src/adapters/cloud-run/vite/index.ts
 import { viteAdapter } from "../../shared/vite/index.mjs";
-function cloudRunAdapter(opts = {}) {
-  const env = process == null ? void 0 : 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",
-    ssg: opts.ssg,
-    cleanStaticGenerated: true,
-    config() {
-      return {
-        build: {
-          ssr: true
-        },
-        publicDir: false
-      };
-    }
-  });
+/** @public */ function cloudRunAdapter(opts = {}) {
+	const env = process?.env;
+	return viteAdapter({
+		name: "cloud-run",
+		origin: env?.ORIGIN ?? env?.URL ?? "https://your-app-name.run.app",
+		ssg: opts.ssg,
+		cleanStaticGenerated: true,
+		config() {
+			return {
+				build: { ssr: true },
+				publicDir: false
+			};
+		}
+	});
 }
-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,80 +1,48 @@
-// packages/qwik-router/src/adapters/cloudflare-pages/vite/index.ts
+import { t as ensureSlash } from "../../../chunks/pathname.mjs";
+import { viteAdapter } from "../../shared/vite/index.mjs";
+import { v as normalizePathSlash } from "../../../chunks/fs.mjs";
 import fs from "node:fs";
 import { join, relative } from "node:path";
-
-// 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;
-  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",
-    ssg: opts.ssg,
-    staticPaths: opts.staticPaths,
-    cleanStaticGenerated: true,
-    config() {
-      return {
-        resolve: {
-          conditions: ["webworker", "worker"]
-        },
-        ssr: {
-          target: "webworker",
-          noExternal: true,
-          external: ["node:async_hooks"]
-        },
-        build: {
-          ssr: true,
-          rollupOptions: {
-            output: {
-              format: "es",
-              hoistTransitiveImports: false
-            }
-          }
-        },
-        publicDir: false
-      };
-    },
-    async generate({ clientOutDir, serverOutDir, basePathname, assetsDir }) {
-      const routesJsonPath = join(clientOutDir, "_routes.json");
-      const hasRoutesJson = fs.existsSync(routesJsonPath);
-      if (!hasRoutesJson && opts.functionRoutes !== false) {
-        let pathName = assetsDir ? join(basePathname, assetsDir) : basePathname;
-        if (!pathName.endsWith("/")) {
-          pathName += "/";
-        }
-        const routesJson = {
-          version: 1,
-          include: [basePathname + "*"],
-          exclude: [pathName + "build/*", pathName + "assets/*"]
-        };
-        await fs.promises.writeFile(routesJsonPath, JSON.stringify(routesJson, void 0, 2));
-      }
-      const workerJsPath = join(clientOutDir, "_worker.js");
-      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 };`
-        );
-      }
-    }
-  });
+/** @public */ function cloudflarePagesAdapter(opts = {}) {
+	const env = process?.env;
+	return viteAdapter({
+		name: "cloudflare-pages",
+		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"] },
+				ssr: {
+					target: "webworker",
+					noExternal: true,
+					external: ["node:async_hooks"]
+				},
+				build: {
+					ssr: true,
+					rolldownOptions: { output: { format: "es" } }
+				},
+				publicDir: false
+			};
+		},
+		async generate({ clientOutDir, serverOutDir, basePathname }) {
+			const routesJsonPath = join(clientOutDir, "_routes.json");
+			if (!fs.existsSync(routesJsonPath) && opts.functionRoutes !== false) {
+				const pathName = ensureSlash(basePathname);
+				const routesJson = {
+					version: 1,
+					include: [basePathname + "*"],
+					exclude: [pathName + "build/*", pathName + "assets/*"]
+				};
+				await fs.promises.writeFile(routesJsonPath, JSON.stringify(routesJson, void 0, 2));
+			}
+			const workerJsPath = join(clientOutDir, "_worker.js");
+			if (!fs.existsSync(workerJsPath)) {
+				const importPath = relative(clientOutDir, join(serverOutDir, "entry.cloudflare-pages"));
+				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,37 +1,27 @@
-// packages/qwik-router/src/adapters/deno-server/vite/index.ts
 import { viteAdapter } from "../../shared/vite/index.mjs";
-function denoServerAdapter(opts = {}) {
-  const env = process == null ? void 0 : 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",
-    ssg: opts.ssg,
-    cleanStaticGenerated: true,
-    config() {
-      return {
-        resolve: {
-          conditions: ["webworker", "worker"]
-        },
-        ssr: {
-          target: "webworker",
-          noExternal: true,
-          external: ["node:async_hooks"]
-        },
-        build: {
-          ssr: true,
-          target: "esnext",
-          rollupOptions: {
-            output: {
-              format: "es",
-              hoistTransitiveImports: false
-            }
-          }
-        },
-        publicDir: false
-      };
-    }
-  });
+/** @beta */ function denoServerAdapter(opts = {}) {
+	const env = process?.env;
+	return viteAdapter({
+		name: opts.name || "deno-server",
+		origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.qwik.dev",
+		ssg: opts.ssg,
+		cleanStaticGenerated: true,
+		config() {
+			return {
+				resolve: { conditions: ["webworker", "worker"] },
+				ssr: {
+					target: "webworker",
+					noExternal: true,
+					external: ["node:async_hooks"]
+				},
+				build: {
+					ssr: true,
+					target: "esnext",
+					rolldownOptions: { output: { format: "es" } }
+				},
+				publicDir: false
+			};
+		}
+	});
 }
-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,92 +1,52 @@
-// packages/qwik-router/src/runtime/src/qwik-router-config.ts
-var basePathname = "/";
-
-// packages/qwik-router/src/adapters/netlify-edge/vite/index.ts
+import { getParentDir, viteAdapter } from "../../shared/vite/index.mjs";
 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;
-  return viteAdapter({
-    name: "netlify-edge",
-    origin: (env == null ? void 0 : env.ORIGIN) ?? (env == null ? void 0 : 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";
-      return {
-        resolve: {
-          conditions: ["webworker", "worker"]
-        },
-        ssr: {
-          target: "webworker",
-          noExternal: true,
-          external: ["node:async_hooks"]
-        },
-        build: {
-          ssr: true,
-          outDir,
-          rollupOptions: {
-            output: {
-              format: "es",
-              hoistTransitiveImports: false
-            }
-          }
-        },
-        publicDir: false
-      };
-    },
-    async generate({ serverOutDir }) {
-      if (opts.functionRoutes !== false) {
-        const excludedPath = [];
-        if (typeof opts.excludedPath === "string") {
-          excludedPath.push(opts.excludedPath);
-        } 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"
-          );
-        }
-        const netlifyEdgeManifest = {
-          functions: [
-            {
-              path: basePathname + "*",
-              function: "entry.netlify-edge",
-              cache: "manual",
-              excludedPath
-            }
-          ],
-          version: 1
-        };
-        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")
-          );
-        }
-        const netlifyEdgeFnsDir = getParentDir(serverOutDir, "edge-functions");
-        await fs.promises.writeFile(
-          join(netlifyEdgeFnsDir, "manifest.json"),
-          JSON.stringify(netlifyEdgeManifest, null, 2)
-        );
-      }
-    }
-  });
+/** @public */ function netlifyEdgeAdapter(opts = {}) {
+	const env = process?.env;
+	return viteAdapter({
+		name: "netlify-edge",
+		origin: env?.ORIGIN ?? env?.URL ?? "https://yoursitename.netlify.app",
+		ssg: opts.ssg,
+		staticPaths: opts.staticPaths,
+		cleanStaticGenerated: true,
+		config(config) {
+			return {
+				resolve: { conditions: ["webworker", "worker"] },
+				ssr: {
+					target: "webworker",
+					noExternal: true,
+					external: ["node:async_hooks"]
+				},
+				build: {
+					ssr: true,
+					outDir: config.build?.outDir || ".netlify/edge-functions/entry.netlify-edge",
+					rolldownOptions: { output: { format: "es" } }
+				},
+				publicDir: false
+			};
+		},
+		async generate({ serverOutDir, basePathname }) {
+			if (opts.functionRoutes !== false) {
+				const excludedPath = [];
+				if (typeof opts.excludedPath === "string") excludedPath.push(opts.excludedPath);
+				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");
+				const netlifyEdgeManifest = {
+					functions: [{
+						path: basePathname + "*",
+						function: "entry.netlify-edge",
+						cache: "manual",
+						excludedPath
+					}],
+					version: 1
+				};
+				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"));
+				const netlifyEdgeFnsDir = getParentDir(serverOutDir, "edge-functions");
+				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 { }