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

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

@@ -1,16 +1,18 @@
 // packages/qwik-router/src/adapters/shared/vite/index.ts
-import fs2 from "node:fs";
 import { basename, dirname, join as join2, resolve } from "node:path";
 
 // packages/qwik-router/src/adapters/shared/vite/post-build.ts
 import { getErrorHtml } from "@qwik.dev/router/middleware/request-handler";
 import fs from "node:fs";
 import { join } from "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) => {
@@ -44,12 +46,9 @@ async function postBuild(clientOutDir, pathName, userStaticPaths, format, cleanS
   if (fs.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("/")) {
@@ -57,7 +56,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;
@@ -77,64 +76,43 @@ function createNotFoundPathsModule(basePathname, notFounds, format) {
     const html = 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 fs.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 fs.promises.writeFile(path, newCode);
+    }
+  };
+  const walk = async (dir) => {
+    const entries = await fs.promises.readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        await walk(join(dir, entry.name));
+      } else if (entry.name.endsWith("js")) {
+        const p = doReplace(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) {
@@ -144,10 +122,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) {
@@ -161,7 +138,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(
@@ -187,9 +164,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) {
@@ -206,23 +195,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();
@@ -230,7 +209,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`;
@@ -243,13 +222,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.mjs");
+            const staticGenerate = await import("../../../ssg/index.mjs");
             const generateOpts = {
               maxWorkers: opts.maxWorkers,
               basePathname,
@@ -269,56 +248,45 @@ function viteAdapter(opts) {
               this.error(err);
             }
             staticPaths.push(...staticGenerateResult.staticPaths);
-            const { staticPathsCode, notFoundPathsCode } = await postBuild(
+          }
+          await postBuild(
+            clientPublicOutDir,
+            serverOutDir,
+            assetsDir ? join2(basePathname, assetsDir) : basePathname,
+            staticPaths,
+            !!opts.cleanStaticGenerated
+          );
+          if (typeof opts.generate === "function") {
+            await opts.generate({
+              outputEntries,
+              serverOutDir,
+              clientOutDir,
               clientPublicOutDir,
-              assetsDir ? join2(basePathname, assetsDir) : basePathname,
-              staticPaths,
-              format,
-              !!opts.cleanStaticGenerated
-            );
-            await Promise.all([
-              fs2.promises.writeFile(join2(serverOutDir, RESOLVED_STATIC_PATHS_ID), staticPathsCode),
-              fs2.promises.writeFile(
-                join2(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.
 ==============================================`
-            );
-          }
+          );
         }
       }
     }
   };
   return plugin;
 }
-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`;
 
-// packages/qwik-router/src/adapters/static/vite/index.ts
-function staticAdapter(opts) {
+// packages/qwik-router/src/adapters/ssg/vite/index.ts
+function ssgAdapter(opts) {
   return viteAdapter({
-    name: "static-generate",
+    name: "static-site-generation",
     origin: opts.origin,
     ssg: {
       include: ["/*"],
@@ -326,6 +294,8 @@ function staticAdapter(opts) {
     }
   });
 }
+var staticAdapter = ssgAdapter;
 export {
+  ssgAdapter,
   staticAdapter
 };

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

@@ -1,7 +1,7 @@
 import { ServerAdapterOptions } from '../../shared/vite';
-import type { StaticGenerateRenderOptions } from '@qwik.dev/router/static';
+import type { SsgRenderOptions } from 'packages/qwik-router/src/ssg';
 
-export { StaticGenerateRenderOptions }
+export { SsgRenderOptions }
 
 /** @public */
 export declare function vercelEdgeAdapter(opts?: VercelEdgeAdapterOptions): any;

package/lib/index.qwik.cjs

@@ -145,7 +145,7 @@ const getFetchOptions = (action, noCache) => {
       method: "POST",
       body: JSON.stringify(actionData),
       headers: {
-        "Content-Type": "application/json, charset=UTF-8"
+        "Content-Type": "application/json; charset=UTF-8"
       }
     };
   }
@@ -802,8 +802,8 @@ const spaInit = core.event$((_, el) => {
     };
     win[scrollEnabled] = true;
     setTimeout(() => {
-      addEventListener("popstate", win[initPopstate]);
-      addEventListener("scroll", win[initScroll], {
+      win.addEventListener("popstate", win[initPopstate]);
+      win.addEventListener("scroll", win[initScroll], {
         passive: true
       });
       document.body.addEventListener("click", win[initAnchors]);
@@ -845,7 +845,7 @@ const QwikRouterProvider = core.component$((props) => {
   core.useStyles$(`
     @layer qwik {
       @supports selector(html:active-view-transition-type(type)) {
-        html:active-view-transition-type(qwik-router-spa) {
+        html:active-view-transition-type(qwik-navigation) {
           :root{view-transition-name:none}
         }
       }
@@ -1047,10 +1047,10 @@ const QwikRouterProvider = core.component$((props) => {
       } else {
         trackUrl = new URL(navigation.dest, location);
         if (trackUrl.pathname.endsWith("/")) {
-          if (!qwikRouterConfig__namespace.trailingSlash) {
+          if (globalThis.__NO_TRAILING_SLASH__) {
             trackUrl.pathname = trackUrl.pathname.slice(0, -1);
           }
-        } else if (qwikRouterConfig__namespace.trailingSlash) {
+        } else if (!globalThis.__NO_TRAILING_SLASH__) {
           trackUrl.pathname += "/";
         }
         let loadRoutePromise = loadRoute(qwikRouterConfig__namespace.routes, qwikRouterConfig__namespace.menus, qwikRouterConfig__namespace.cacheModules, trackUrl.pathname);
@@ -1092,8 +1092,7 @@ const QwikRouterProvider = core.component$((props) => {
         const [routeName, params, mods, menu] = loadedRoute;
         const contentModules = mods;
         const pageModule = contentModules[contentModules.length - 1];
-        const isRedirect = navType === "form" && !isSamePath(trackUrl, prevUrl);
-        if (navigation.dest.search && !isRedirect) {
+        if (navigation.dest.search && !!isSamePath(trackUrl, prevUrl)) {
           trackUrl.search = navigation.dest.search;
         }
         if (!isSamePath(trackUrl, prevUrl)) {
@@ -1123,7 +1122,7 @@ const QwikRouterProvider = core.component$((props) => {
             scrollState = getScrollHistory();
           }
           const scroller = document.getElementById(QWIK_ROUTER_SCROLLER) ?? document.documentElement;
-          if (navigation.scroll && (!navigation.forceReload || !isSamePath(trackUrl, prevUrl)) && (navType === "link" || navType === "popstate") || isRedirect) {
+          if (navigation.scroll && (!navigation.forceReload || !isSamePath(trackUrl, prevUrl)) && (navType === "link" || navType === "popstate") || navType === "form" && !isSamePath(trackUrl, prevUrl)) {
             document.__q_scroll_restore__ = () => restoreScroll(navType, trackUrl, prevUrl, scroller, scrollState);
           }
           const loaders = clientPageData?.loaders;
@@ -1552,8 +1551,7 @@ const globalAction$ = /* @__PURE__ */ core.implicit$FirstArg(globalActionQrl);
 const routeLoaderQrl = (loaderQrl, ...rest) => {
   const { id, validators, serializationStrategy } = getValidators(rest, loaderQrl);
   function loader() {
-    const iCtx = internal._useInvokeContext();
-    const state = iCtx.$container$.resolveContext(iCtx.$hostElement$, RouteStateContext);
+    const state = internal._resolveContextWithoutSequentialScope(RouteStateContext);
     if (!(id in state)) {
       throw new Error(`routeLoader$ "${loaderQrl.getSymbol()}" was invoked in a route where it was not declared.
     This is because the routeLoader$ was not exported in a 'layout.tsx' or 'index.tsx' file of the existing route.

package/lib/index.qwik.mjs

@@ -1,7 +1,7 @@
 import { jsx, Fragment, jsxs } from "@qwik.dev/core/jsx-runtime";
 import { component$, useErrorBoundary, useOnWindow, $, Slot, createAsyncComputed$, isBrowser, createContextId, implicit$FirstArg, useContext, useVisibleTask$, noSerialize, useServerData, useSignal, untrack, sync$, isDev, withLocale, event$, useStyles$, isServer, useStore, useContextProvider, useTask$, getLocale, jsx as jsx$1, SkipRender } from "@qwik.dev/core";
 import { p } from "@qwik.dev/core/preloader";
-import { _deserialize, _UNINITIALIZED, _getContextContainer, SerializerSymbol, _getContextElement, _getQContainerElement, _waitUntilRendered, _useInvokeContext, _getContextEvent, _serialize } from "@qwik.dev/core/internal";
+import { _deserialize, _UNINITIALIZED, _getContextContainer, SerializerSymbol, _getContextElement, _getQContainerElement, _waitUntilRendered, _resolveContextWithoutSequentialScope, _getContextEvent, _serialize } from "@qwik.dev/core/internal";
 import * as qwikRouterConfig from "@qwik-router-config";
 import { z } from "zod";
 import { z as z2 } from "zod";
@@ -127,7 +127,7 @@ const getFetchOptions = (action, noCache) => {
       method: "POST",
       body: JSON.stringify(actionData),
       headers: {
-        "Content-Type": "application/json, charset=UTF-8"
+        "Content-Type": "application/json; charset=UTF-8"
       }
     };
   }
@@ -784,8 +784,8 @@ const spaInit = event$((_, el) => {
     };
     win[scrollEnabled] = true;
     setTimeout(() => {
-      addEventListener("popstate", win[initPopstate]);
-      addEventListener("scroll", win[initScroll], {
+      win.addEventListener("popstate", win[initPopstate]);
+      win.addEventListener("scroll", win[initScroll], {
         passive: true
       });
       document.body.addEventListener("click", win[initAnchors]);
@@ -827,7 +827,7 @@ const QwikRouterProvider = component$((props) => {
   useStyles$(`
     @layer qwik {
       @supports selector(html:active-view-transition-type(type)) {
-        html:active-view-transition-type(qwik-router-spa) {
+        html:active-view-transition-type(qwik-navigation) {
           :root{view-transition-name:none}
         }
       }
@@ -1029,10 +1029,10 @@ const QwikRouterProvider = component$((props) => {
       } else {
         trackUrl = new URL(navigation.dest, location);
         if (trackUrl.pathname.endsWith("/")) {
-          if (!qwikRouterConfig.trailingSlash) {
+          if (globalThis.__NO_TRAILING_SLASH__) {
             trackUrl.pathname = trackUrl.pathname.slice(0, -1);
           }
-        } else if (qwikRouterConfig.trailingSlash) {
+        } else if (!globalThis.__NO_TRAILING_SLASH__) {
           trackUrl.pathname += "/";
         }
         let loadRoutePromise = loadRoute(qwikRouterConfig.routes, qwikRouterConfig.menus, qwikRouterConfig.cacheModules, trackUrl.pathname);
@@ -1074,8 +1074,7 @@ const QwikRouterProvider = component$((props) => {
         const [routeName, params, mods, menu] = loadedRoute;
         const contentModules = mods;
         const pageModule = contentModules[contentModules.length - 1];
-        const isRedirect = navType === "form" && !isSamePath(trackUrl, prevUrl);
-        if (navigation.dest.search && !isRedirect) {
+        if (navigation.dest.search && !!isSamePath(trackUrl, prevUrl)) {
           trackUrl.search = navigation.dest.search;
         }
         if (!isSamePath(trackUrl, prevUrl)) {
@@ -1105,7 +1104,7 @@ const QwikRouterProvider = component$((props) => {
             scrollState = getScrollHistory();
           }
           const scroller = document.getElementById(QWIK_ROUTER_SCROLLER) ?? document.documentElement;
-          if (navigation.scroll && (!navigation.forceReload || !isSamePath(trackUrl, prevUrl)) && (navType === "link" || navType === "popstate") || isRedirect) {
+          if (navigation.scroll && (!navigation.forceReload || !isSamePath(trackUrl, prevUrl)) && (navType === "link" || navType === "popstate") || navType === "form" && !isSamePath(trackUrl, prevUrl)) {
             document.__q_scroll_restore__ = () => restoreScroll(navType, trackUrl, prevUrl, scroller, scrollState);
           }
           const loaders = clientPageData?.loaders;
@@ -1534,8 +1533,7 @@ const globalAction$ = /* @__PURE__ */ implicit$FirstArg(globalActionQrl);
 const routeLoaderQrl = (loaderQrl, ...rest) => {
   const { id, validators, serializationStrategy } = getValidators(rest, loaderQrl);
   function loader() {
-    const iCtx = _useInvokeContext();
-    const state = iCtx.$container$.resolveContext(iCtx.$hostElement$, RouteStateContext);
+    const state = _resolveContextWithoutSequentialScope(RouteStateContext);
     if (!(id in state)) {
       throw new Error(`routeLoader$ "${loaderQrl.getSymbol()}" was invoked in a route where it was not declared.
     This is because the routeLoader$ was not exported in a 'layout.tsx' or 'index.tsx' file of the existing route.

package/lib/middleware/aws-lambda/index.d.ts

@@ -11,8 +11,9 @@ import { ServerResponse } from 'http';
 declare interface AwsOpt {
     render: Render;
     manifest?: QwikManifest;
-    qwikRouterConfig: QwikRouterConfig;
-    /** @deprecated Use `QwikRouterConfig` instead. Will be removed in V3 */
+    /** @deprecated Not used */
+    qwikRouterConfig?: QwikRouterConfig;
+    /** @deprecated Not used */
     qwikCityPlan?: QwikCityPlan;
 }
 

package/lib/middleware/aws-lambda/index.mjs

@@ -2,10 +2,8 @@
 import { createQwikRouter as createQwikRouterNode } from "@qwik.dev/router/middleware/node";
 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.");
   }
   try {
     const { router, staticFile, notFound } = createQwikRouterNode({
@@ -23,7 +21,7 @@ function createQwikRouter(opts) {
       }
     });
     const fixPath = (pathT) => {
-      if (opts.qwikRouterConfig.trailingSlash) {
+      if (!globalThis.__NO_TRAILING_SLASH__) {
         const url = new URL(pathT, "http://aws-qwik.local");
         if (url.pathname.includes(".", url.pathname.lastIndexOf("/"))) {
           return pathT;

package/lib/middleware/azure-swa/index.mjs

@@ -194,17 +194,17 @@ var require_set_cookie = __commonJS({
 
 // packages/qwik-router/src/middleware/azure-swa/index.ts
 var import_set_cookie_parser = __toESM(require_set_cookie(), 1);
-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 { requestHandler } from "../request-handler/index.mjs";
+import {
+  getNotFound,
+  isStaticPath,
+  requestHandler
+} from "../request-handler/index.mjs";
 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/middleware/bun/index.mjs

@@ -1,10 +1,10 @@
 // packages/qwik-router/src/middleware/bun/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 {
   _TextEncoderStream_polyfill,
+  getNotFound,
+  isStaticPath,
   mergeHeadersCookies,
   requestHandler
 } from "../request-handler/index.mjs";
@@ -66,10 +66,8 @@ var MIME_TYPES = {
 function createQwikRouter(opts) {
   var _a;
   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.");
   }
   globalThis.TextEncoderStream ||= _TextEncoderStream_polyfill;
   const qwikSerializer = { _deserialize, _serialize, _verifySerializable };
@@ -155,7 +153,7 @@ function createQwikRouter(opts) {
     let filePath;
     if (fileName.includes(".")) {
       filePath = join(staticFolder, pathname);
-    } else if (opts.qwikRouterConfig.trailingSlash) {
+    } else if (!globalThis.__NO_TRAILING_SLASH__) {
       filePath = join(staticFolder, pathname + "index.html");
     } else {
       filePath = join(staticFolder, pathname, "index.html");

package/lib/middleware/cloudflare-pages/index.mjs

@@ -1,23 +1,21 @@
 // packages/qwik-router/src/middleware/cloudflare-pages/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 {
   _TextEncoderStream_polyfill,
+  getNotFound,
+  isStaticPath,
   mergeHeadersCookies,
   requestHandler
 } from "../request-handler/index.mjs";
 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.");
   }
   try {
     new globalThis.TextEncoderStream();
-  } catch (e) {
+  } catch {
     globalThis.TextEncoderStream = _TextEncoderStream_polyfill;
   }
   const qwikSerializer = { _deserialize, _serialize, _verifySerializable };

package/lib/middleware/deno/index.mjs

@@ -1,9 +1,12 @@
 // packages/qwik-router/src/middleware/deno/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";
 
 // packages/qwik-router/src/middleware/request-handler/mime-types.ts
 var MIME_TYPES = {
@@ -62,10 +65,8 @@ import { extname, fromFileUrl, join } from "https://deno.land/std/path/mod.ts";
 function createQwikRouter(opts) {
   var _a;
   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,
@@ -147,7 +148,7 @@ function createQwikRouter(opts) {
     let filePath;
     if (fileName.includes(".")) {
       filePath = join(staticFolder, pathname);
-    } else if (opts.qwikRouterConfig.trailingSlash) {
+    } else if (!globalThis.__NO_TRAILING_SLASH__) {
       filePath = join(staticFolder, pathname + "index.html");
     } else {
       filePath = join(staticFolder, pathname, "index.html");

package/lib/middleware/firebase/index.mjs

@@ -2,10 +2,8 @@
 import { createQwikRouter as createQwikRouterNode } from "@qwik.dev/router/middleware/node";
 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 { staticFile, notFound, router } = createQwikRouterNode({
     render: opts.render,