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

package/lib/middleware/vercel-edge/index.mjs

@@ -1,9 +1,12 @@
 // packages/qwik-router/src/middleware/vercel-edge/index.ts
-import { getNotFound } from "@qwik-router-not-found-paths";
-import { isStaticPath } from "@qwik-router-static-paths";
 import { _deserialize, _serialize, _verifySerializable } from "@qwik.dev/core/internal";
 import { setServerPlatform } from "@qwik.dev/core/server";
-import { mergeHeadersCookies, requestHandler } from "../request-handler/index.mjs";
+import {
+  getNotFound,
+  isStaticPath,
+  mergeHeadersCookies,
+  requestHandler
+} from "../request-handler/index.mjs";
 var COUNTRY_HEADER_NAME = "x-vercel-ip-country";
 var IP_HEADER_NAME = "x-real-ip";
 var VERCEL_COOKIE = "__vdpl";
@@ -12,10 +15,8 @@ var VERCEL_DEPLOYMENT_ID = "VERCEL_DEPLOYMENT_ID";
 var BASE_URL = "BASE_URL";
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
-    console.warn("qwikCityPlan is deprecated. Use qwikRouterConfig instead.");
+    console.warn("qwikCityPlan is deprecated. Simply remove it.");
     opts.qwikRouterConfig = opts.qwikCityPlan;
-  } else if (!opts.qwikRouterConfig) {
-    throw new Error("qwikRouterConfig is required.");
   }
   const qwikSerializer = {
     _deserialize,

package/lib/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/lib/{static → ssg}/deno.mjs

@@ -1,4 +1,4 @@
-// packages/qwik-router/src/static/deno/index.ts
+// packages/qwik-router/src/ssg/deno/index.ts
 async function generate(_opts) {
   console.error(`Deno not implemented`);
   Deno.exit(1);

package/lib/{static → ssg}/index.cjs

@@ -17,7 +17,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/qwik-router/src/static/index.ts
+// packages/qwik-router/src/ssg/index.ts
 var index_exports = {};
 __export(index_exports, {
   generate: () => generate

package/lib/{static → ssg}/index.d.ts

@@ -9,23 +9,7 @@ import type { RenderOptions } from '@qwik.dev/core/server';
 export declare function generate(opts: StaticGenerateOptions): Promise<StaticGenerateResult>;
 
 /** @public */
-export declare interface StaticGenerateOptions extends StaticGenerateRenderOptions {
-    /**
-     * Path to the SSR module exporting the default render function. In most cases it'll be
-     * `./src/entry.ssr.tsx`.
-     */
-    renderModulePath: string;
-    /** Path to the Qwik Router Config module exporting the default `@qwik-router-config`. */
-    qwikRouterConfigModulePath: string;
-    /** @deprecated Use `qwikRouterConfigModulePath` instead. Will be removed in V3 */
-    qwikCityPlanModulePath?: string;
-    /** Defaults to `/` */
-    basePathname?: string;
-    rootDir?: string;
-}
-
-/** @public */
-export declare interface StaticGenerateRenderOptions extends RenderOptions {
+export declare interface SsgRenderOptions extends RenderOptions {
     /** File system directory where the static files should be written. */
     outDir: string;
     /**
@@ -85,6 +69,22 @@ export declare interface StaticGenerateRenderOptions extends RenderOptions {
     exclude?: string[];
 }
 
+/** @public */
+export declare interface StaticGenerateOptions extends SsgRenderOptions {
+    /**
+     * Path to the SSR module exporting the default render function. In most cases it'll be
+     * `./src/entry.ssr.tsx`.
+     */
+    renderModulePath: string;
+    /** Path to the Qwik Router Config module exporting the default `@qwik-router-config`. */
+    qwikRouterConfigModulePath: string;
+    /** @deprecated Use `qwikRouterConfigModulePath` instead. Will be removed in V3 */
+    qwikCityPlanModulePath?: string;
+    /** Defaults to `/` */
+    basePathname?: string;
+    rootDir?: string;
+}
+
 /** @public */
 export declare interface StaticGenerateResult {
     duration: number;

package/lib/{static → ssg}/index.mjs

@@ -5,7 +5,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// packages/qwik-router/src/static/index.ts
+// packages/qwik-router/src/ssg/index.ts
 async function generate(opts) {
   const ssgPlatform = await getEntryModule();
   const result = await ssgPlatform.generate(opts);

package/lib/{static → ssg}/node.cjs

@@ -27,18 +27,18 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// packages/qwik-router/src/static/node/index.ts
+// packages/qwik-router/src/ssg/node/index.ts
 var index_exports = {};
 __export(index_exports, {
   generate: () => generate
 });
 module.exports = __toCommonJS(index_exports);
 
-// packages/qwik-router/src/static/node/node-system.ts
+// packages/qwik-router/src/ssg/node/node-system.ts
 var import_node_fs2 = __toESM(require("node:fs"), 1);
 var import_node_path3 = require("node:path");
 
-// packages/qwik-router/src/static/node/node-main.ts
+// packages/qwik-router/src/ssg/node/node-main.ts
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_os = require("node:os");
 var import_node_worker_threads = require("node:worker_threads");
@@ -93,7 +93,7 @@ function normalizePathSlash(path) {
   return path;
 }
 
-// packages/qwik-router/src/static/worker-thread.ts
+// packages/qwik-router/src/ssg/worker-thread.ts
 var import_internal = require("@qwik.dev/core/internal");
 var import_request_handler = require("../middleware/request-handler/index.cjs");
 var import_web = require("node:stream/web");
@@ -347,7 +347,7 @@ var noopWritableStream = {
   }
 };
 
-// packages/qwik-router/src/static/node/node-main.ts
+// packages/qwik-router/src/ssg/node/node-main.ts
 var import_meta = {};
 async function createNodeMainProcess(sys, opts) {
   const ssgWorkers = [];
@@ -471,9 +471,9 @@ async function createNodeMainProcess(sys, opts) {
     const ssgWorker = getNextWorker();
     return ssgWorker.activeTasks < maxTasksPerWorker;
   };
-  const render = async (staticRoute) => {
+  const render = async (ssgRoute) => {
     const ssgWorker = getNextWorker();
-    const result = await ssgWorker.render(staticRoute);
+    const result = await ssgWorker.render(ssgRoute);
     if (sitemapOutFile && result.ok && result.resourceType === "page") {
       sitemapBuffer.push(`<url><loc>${result.url}</loc></url>`);
       if (sitemapBuffer.length > 50) {
@@ -536,7 +536,7 @@ function ssgWorkerCompare(a, b) {
   return a.totalTasks < b.totalTasks ? -1 : 1;
 }
 
-// packages/qwik-router/src/static/node/node-worker.ts
+// packages/qwik-router/src/ssg/node/node-worker.ts
 var import_node_worker_threads2 = require("node:worker_threads");
 async function createNodeWorkerProcess(onMessage) {
   var _a;
@@ -546,7 +546,7 @@ async function createNodeWorkerProcess(onMessage) {
   });
 }
 
-// packages/qwik-router/src/static/node/node-system.ts
+// packages/qwik-router/src/ssg/node/node-system.ts
 async function createSystem(opts) {
   const createWriteStream = (filePath) => {
     return import_node_fs2.default.createWriteStream(filePath, {
@@ -631,7 +631,7 @@ var access = async (path) => {
   }
 };
 
-// packages/qwik-router/src/static/node/index.ts
+// packages/qwik-router/src/ssg/node/index.ts
 var import_node_worker_threads3 = require("node:worker_threads");
 
 // node_modules/.pnpm/kleur@4.1.5/node_modules/kleur/colors.mjs
@@ -682,7 +682,7 @@ var bgMagenta = init(45, 49);
 var bgCyan = init(46, 49);
 var bgWhite = init(47, 49);
 
-// packages/qwik-router/src/static/main-thread.ts
+// packages/qwik-router/src/ssg/main-thread.ts
 var import_node_path4 = require("node:path");
 var import_node_url2 = require("node:url");
 var import_vite = require("vite");
@@ -813,7 +813,7 @@ function formatError(e) {
   return e;
 }
 
-// packages/qwik-router/src/static/extract-params.ts
+// packages/qwik-router/src/ssg/extract-params.ts
 function extractParamNames(routeName) {
   const params = [];
   let idx = 0;
@@ -831,7 +831,7 @@ function extractParamNames(routeName) {
   return params;
 }
 
-// packages/qwik-router/src/static/not-found.ts
+// packages/qwik-router/src/ssg/not-found.ts
 var import_request_handler2 = require("../middleware/request-handler/index.cjs");
 async function generateNotFoundPages(sys, opts, routes) {
   if (opts.emit404Pages !== false) {
@@ -853,7 +853,7 @@ async function generateNotFoundPages(sys, opts, routes) {
   }
 }
 
-// packages/qwik-router/src/static/routes.ts
+// packages/qwik-router/src/ssg/routes.ts
 function createRouteTester(basePathname, includeRoutes, excludeRoutes) {
   const includes = routesToRegExps(includeRoutes);
   const excludes = routesToRegExps(excludeRoutes);
@@ -900,7 +900,7 @@ function routeToRegExp(rule) {
   return new RegExp(transformedRule);
 }
 
-// packages/qwik-router/src/static/main-thread.ts
+// packages/qwik-router/src/ssg/main-thread.ts
 async function mainThread(sys) {
   const opts = sys.getOptions();
   validateOptions(opts);
@@ -1105,7 +1105,7 @@ function validateOptions(opts) {
   }
 }
 
-// packages/qwik-router/src/static/node/index.ts
+// packages/qwik-router/src/ssg/node/index.ts
 async function generate(opts) {
   if (import_node_worker_threads3.isMainThread) {
     const sys = await createSystem(opts);

package/lib/{static → ssg}/node.mjs

@@ -1,8 +1,8 @@
-// packages/qwik-router/src/static/node/node-system.ts
+// packages/qwik-router/src/ssg/node/node-system.ts
 import fs2 from "node:fs";
 import { dirname as dirname2, join } from "node:path";
 
-// packages/qwik-router/src/static/node/node-main.ts
+// packages/qwik-router/src/ssg/node/node-main.ts
 import fs from "node:fs";
 import { cpus as nodeCpus } from "node:os";
 import { Worker } from "node:worker_threads";
@@ -57,7 +57,7 @@ function normalizePathSlash(path) {
   return path;
 }
 
-// packages/qwik-router/src/static/worker-thread.ts
+// packages/qwik-router/src/ssg/worker-thread.ts
 import { _deserialize, _serialize, _verifySerializable } from "@qwik.dev/core/internal";
 import { requestHandler, RequestEvShareQData } from "../middleware/request-handler/index.mjs";
 import { WritableStream } from "node:stream/web";
@@ -311,7 +311,7 @@ var noopWritableStream = {
   }
 };
 
-// packages/qwik-router/src/static/node/node-main.ts
+// packages/qwik-router/src/ssg/node/node-main.ts
 async function createNodeMainProcess(sys, opts) {
   const ssgWorkers = [];
   const sitemapBuffer = [];
@@ -434,9 +434,9 @@ async function createNodeMainProcess(sys, opts) {
     const ssgWorker = getNextWorker();
     return ssgWorker.activeTasks < maxTasksPerWorker;
   };
-  const render = async (staticRoute) => {
+  const render = async (ssgRoute) => {
     const ssgWorker = getNextWorker();
-    const result = await ssgWorker.render(staticRoute);
+    const result = await ssgWorker.render(ssgRoute);
     if (sitemapOutFile && result.ok && result.resourceType === "page") {
       sitemapBuffer.push(`<url><loc>${result.url}</loc></url>`);
       if (sitemapBuffer.length > 50) {
@@ -499,7 +499,7 @@ function ssgWorkerCompare(a, b) {
   return a.totalTasks < b.totalTasks ? -1 : 1;
 }
 
-// packages/qwik-router/src/static/node/node-worker.ts
+// packages/qwik-router/src/ssg/node/node-worker.ts
 import { parentPort } from "node:worker_threads";
 async function createNodeWorkerProcess(onMessage) {
   var _a;
@@ -509,7 +509,7 @@ async function createNodeWorkerProcess(onMessage) {
   });
 }
 
-// packages/qwik-router/src/static/node/node-system.ts
+// packages/qwik-router/src/ssg/node/node-system.ts
 async function createSystem(opts) {
   const createWriteStream = (filePath) => {
     return fs2.createWriteStream(filePath, {
@@ -594,7 +594,7 @@ var access = async (path) => {
   }
 };
 
-// packages/qwik-router/src/static/node/index.ts
+// packages/qwik-router/src/ssg/node/index.ts
 import { isMainThread, workerData } from "node:worker_threads";
 
 // node_modules/.pnpm/kleur@4.1.5/node_modules/kleur/colors.mjs
@@ -645,7 +645,7 @@ var bgMagenta = init(45, 49);
 var bgCyan = init(46, 49);
 var bgWhite = init(47, 49);
 
-// packages/qwik-router/src/static/main-thread.ts
+// packages/qwik-router/src/ssg/main-thread.ts
 import { relative as relative2 } from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 import { buildErrorMessage } from "vite";
@@ -776,7 +776,7 @@ function formatError(e) {
   return e;
 }
 
-// packages/qwik-router/src/static/extract-params.ts
+// packages/qwik-router/src/ssg/extract-params.ts
 function extractParamNames(routeName) {
   const params = [];
   let idx = 0;
@@ -794,7 +794,7 @@ function extractParamNames(routeName) {
   return params;
 }
 
-// packages/qwik-router/src/static/not-found.ts
+// packages/qwik-router/src/ssg/not-found.ts
 import { getErrorHtml } from "../middleware/request-handler/index.mjs";
 async function generateNotFoundPages(sys, opts, routes) {
   if (opts.emit404Pages !== false) {
@@ -816,7 +816,7 @@ async function generateNotFoundPages(sys, opts, routes) {
   }
 }
 
-// packages/qwik-router/src/static/routes.ts
+// packages/qwik-router/src/ssg/routes.ts
 function createRouteTester(basePathname, includeRoutes, excludeRoutes) {
   const includes = routesToRegExps(includeRoutes);
   const excludes = routesToRegExps(excludeRoutes);
@@ -863,7 +863,7 @@ function routeToRegExp(rule) {
   return new RegExp(transformedRule);
 }
 
-// packages/qwik-router/src/static/main-thread.ts
+// packages/qwik-router/src/ssg/main-thread.ts
 async function mainThread(sys) {
   const opts = sys.getOptions();
   validateOptions(opts);
@@ -1068,7 +1068,7 @@ function validateOptions(opts) {
   }
 }
 
-// packages/qwik-router/src/static/node/index.ts
+// packages/qwik-router/src/ssg/node/index.ts
 async function generate(opts) {
   if (isMainThread) {
     const sys = await createSystem(opts);