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

package/lib/index.qwik.cjs

@@ -7,6 +7,7 @@ const internal = require("@qwik.dev/core/internal");
 const qwikRouterConfig = require("@qwik-router-config");
 const zod = require("zod");
 const swRegister = require("@qwik-router-sw-register");
+const server = require("@qwik.dev/core/server");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -145,7 +146,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"
       }
     };
   }
@@ -366,8 +367,8 @@ const Link = core.component$((props) => {
     children: /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {})
   });
 });
-const resolveHead = (endpoint, routeLocation, contentModules, locale) => {
-  const head = createDocumentHead();
+const resolveHead = (endpoint, routeLocation, contentModules, locale, defaults) => {
+  const head = createDocumentHead(defaults);
   const getData = (loaderOrAction) => {
     const id = loaderOrAction.__id;
     if (loaderOrAction.__brand === "server_loader") {
@@ -423,13 +424,23 @@ const mergeArray = (existingArr, newArr) => {
     }
   }
 };
-const createDocumentHead = () => ({
-  title: "",
-  meta: [],
-  links: [],
-  styles: [],
-  scripts: [],
-  frontmatter: {}
+const createDocumentHead = (defaults) => ({
+  title: defaults?.title || "",
+  meta: [
+    ...defaults?.meta || []
+  ],
+  links: [
+    ...defaults?.links || []
+  ],
+  styles: [
+    ...defaults?.styles || []
+  ],
+  scripts: [
+    ...defaults?.scripts || []
+  ],
+  frontmatter: {
+    ...defaults?.frontmatter
+  }
 });
 function matchRoute(route, path) {
   const routeIdx = startIdxSkipSlash(route);
@@ -841,11 +852,11 @@ const preventNav = {};
 const internalState = {
   navCount: 0
 };
-const QwikRouterProvider = core.component$((props) => {
+const useQwikRouter = (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}
         }
       }
@@ -862,6 +873,7 @@ const QwikRouterProvider = core.component$((props) => {
   if (!urlEnv) {
     throw new Error(`Missing Qwik URL Env Data`);
   }
+  const serverHead = core.useServerData("documentHead");
   if (core.isServer) {
     if (env.ev.originalUrl.pathname !== env.ev.url.pathname && !__EXPERIMENTAL__.enableRequestRewrite) {
       throw new Error(`enableRequestRewrite is an experimental feature and is not enabled. Please enable the feature flag by adding \`experimental: ["enableRequestRewrite"]\` to your qwikVite plugin options.`);
@@ -901,7 +913,7 @@ const QwikRouterProvider = core.component$((props) => {
     replaceState: false,
     scroll: true
   });
-  const documentHead = core.useStore(createDocumentHead);
+  const documentHead = core.useStore(() => createDocumentHead(serverHead));
   const content = core.useStore({
     headings: void 0,
     menu: void 0
@@ -1047,10 +1059,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 +1104,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)) {
@@ -1107,7 +1118,7 @@ const QwikRouterProvider = core.component$((props) => {
           type: navType,
           dest: trackUrl
         };
-        const resolvedHead = resolveHead(clientPageData, routeLocation, contentModules, locale);
+        const resolvedHead = resolveHead(clientPageData, routeLocation, contentModules, locale, serverHead);
         content.headings = pageModule.headings;
         content.menu = menu;
         contentInternal.value = core.noSerialize(contentModules);
@@ -1123,7 +1134,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;
@@ -1255,7 +1266,7 @@ const QwikRouterProvider = core.component$((props) => {
             return internal._waitUntilRendered(elm);
           };
           const _waitNextPage = () => {
-            if (core.isServer || props.viewTransition === false) {
+            if (core.isServer || props?.viewTransition === false) {
               return navigate();
             } else {
               const viewTransition = startViewTransition({
@@ -1291,10 +1302,13 @@ const QwikRouterProvider = core.component$((props) => {
       run();
     }
   });
+};
+const QwikRouterProvider = core.component$((props) => {
+  useQwikRouter(props);
   return /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {});
 });
 const QwikCityProvider = QwikRouterProvider;
-const QwikRouterMockProvider = core.component$((props) => {
+const useQwikMockRouter = (props) => {
   const urlEnv = props.url ?? "http://localhost/";
   const url = new URL(urlEnv);
   const routeLocation = core.useStore({
@@ -1332,6 +1346,9 @@ const QwikRouterMockProvider = core.component$((props) => {
   core.useContextProvider(RouteStateContext, loaderState);
   core.useContextProvider(RouteActionContext, actionState);
   core.useContextProvider(RouteInternalContext, routeInternal);
+};
+const QwikRouterMockProvider = core.component$((props) => {
+  useQwikMockRouter(props);
   return /* @__PURE__ */ jsxRuntime.jsx(core.Slot, {});
 });
 const QwikCityMockProvider = QwikRouterMockProvider;
@@ -1552,8 +1569,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.
@@ -1983,10 +1999,55 @@ function omitProps(obj, keys) {
   }
   return omittedObj;
 }
+const createRenderer = (getOptions) => {
+  return (opts) => {
+    const { jsx, options } = getOptions(opts);
+    return server.renderToStream(jsx, options);
+  };
+};
+const DocumentHeadTags = core.component$((props) => {
+  let head = useDocumentHead();
+  if (props) {
+    head = {
+      ...head,
+      ...props
+    };
+  }
+  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [
+      head.title && /* @__PURE__ */ jsxRuntime.jsx("title", {
+        children: head.title
+      }),
+      head.meta.map((m) => /* @__PURE__ */ jsxRuntime.jsx("meta", {
+        ...m
+      })),
+      head.links.map((l) => /* @__PURE__ */ jsxRuntime.jsx("link", {
+        ...l
+      })),
+      head.styles.map((s) => {
+        const props2 = s.props || s;
+        return /* @__PURE__ */ core.createElement("style", {
+          ...props2,
+          dangerouslySetInnerHTML: s.style || props2.dangerouslySetInnerHTML,
+          key: s.key
+        });
+      }),
+      head.scripts.map((s) => {
+        const props2 = s.props || s;
+        return /* @__PURE__ */ core.createElement("script", {
+          ...props2,
+          dangerouslySetInnerHTML: s.script || props2.dangerouslySetInnerHTML,
+          key: s.key
+        });
+      })
+    ]
+  });
+});
 Object.defineProperty(exports, "z", {
   enumerable: true,
   get: () => zod.z
 });
+exports.DocumentHeadTags = DocumentHeadTags;
 exports.ErrorBoundary = ErrorBoundary;
 exports.Form = Form;
 exports.Link = Link;
@@ -1998,6 +2059,7 @@ exports.QwikRouterMockProvider = QwikRouterMockProvider;
 exports.QwikRouterProvider = QwikRouterProvider;
 exports.RouterOutlet = RouterOutlet;
 exports.ServiceWorkerRegister = ServiceWorkerRegister;
+exports.createRenderer = createRenderer;
 exports.globalAction$ = globalAction$;
 exports.globalActionQrl = globalActionQrl;
 exports.omitProps = omitProps;
@@ -2014,6 +2076,7 @@ exports.useLocation = useLocation;
 exports.useNavigate = useNavigate;
 exports.usePreventNavigate$ = usePreventNavigate$;
 exports.usePreventNavigateQrl = usePreventNavigateQrl;
+exports.useQwikRouter = useQwikRouter;
 exports.valibot$ = valibot$;
 exports.valibotQrl = valibotQrl;
 exports.validator$ = validator$;

package/lib/index.qwik.mjs

@@ -1,11 +1,12 @@
 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 { 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, createElement } 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";
 import swRegister from "@qwik-router-sw-register";
+import { renderToStream } from "@qwik.dev/core/server";
 const ErrorBoundary = component$((props) => {
   const store2 = useErrorBoundary();
   useOnWindow("qerror", $((e) => {
@@ -127,7 +128,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"
       }
     };
   }
@@ -348,8 +349,8 @@ const Link = component$((props) => {
     children: /* @__PURE__ */ jsx(Slot, {})
   });
 });
-const resolveHead = (endpoint, routeLocation, contentModules, locale) => {
-  const head = createDocumentHead();
+const resolveHead = (endpoint, routeLocation, contentModules, locale, defaults) => {
+  const head = createDocumentHead(defaults);
   const getData = (loaderOrAction) => {
     const id = loaderOrAction.__id;
     if (loaderOrAction.__brand === "server_loader") {
@@ -405,13 +406,23 @@ const mergeArray = (existingArr, newArr) => {
     }
   }
 };
-const createDocumentHead = () => ({
-  title: "",
-  meta: [],
-  links: [],
-  styles: [],
-  scripts: [],
-  frontmatter: {}
+const createDocumentHead = (defaults) => ({
+  title: defaults?.title || "",
+  meta: [
+    ...defaults?.meta || []
+  ],
+  links: [
+    ...defaults?.links || []
+  ],
+  styles: [
+    ...defaults?.styles || []
+  ],
+  scripts: [
+    ...defaults?.scripts || []
+  ],
+  frontmatter: {
+    ...defaults?.frontmatter
+  }
 });
 function matchRoute(route, path) {
   const routeIdx = startIdxSkipSlash(route);
@@ -823,11 +834,11 @@ const preventNav = {};
 const internalState = {
   navCount: 0
 };
-const QwikRouterProvider = component$((props) => {
+const useQwikRouter = (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}
         }
       }
@@ -844,6 +855,7 @@ const QwikRouterProvider = component$((props) => {
   if (!urlEnv) {
     throw new Error(`Missing Qwik URL Env Data`);
   }
+  const serverHead = useServerData("documentHead");
   if (isServer) {
     if (env.ev.originalUrl.pathname !== env.ev.url.pathname && !__EXPERIMENTAL__.enableRequestRewrite) {
       throw new Error(`enableRequestRewrite is an experimental feature and is not enabled. Please enable the feature flag by adding \`experimental: ["enableRequestRewrite"]\` to your qwikVite plugin options.`);
@@ -883,7 +895,7 @@ const QwikRouterProvider = component$((props) => {
     replaceState: false,
     scroll: true
   });
-  const documentHead = useStore(createDocumentHead);
+  const documentHead = useStore(() => createDocumentHead(serverHead));
   const content = useStore({
     headings: void 0,
     menu: void 0
@@ -1029,10 +1041,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 +1086,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)) {
@@ -1089,7 +1100,7 @@ const QwikRouterProvider = component$((props) => {
           type: navType,
           dest: trackUrl
         };
-        const resolvedHead = resolveHead(clientPageData, routeLocation, contentModules, locale);
+        const resolvedHead = resolveHead(clientPageData, routeLocation, contentModules, locale, serverHead);
         content.headings = pageModule.headings;
         content.menu = menu;
         contentInternal.value = noSerialize(contentModules);
@@ -1105,7 +1116,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;
@@ -1237,7 +1248,7 @@ const QwikRouterProvider = component$((props) => {
             return _waitUntilRendered(elm);
           };
           const _waitNextPage = () => {
-            if (isServer || props.viewTransition === false) {
+            if (isServer || props?.viewTransition === false) {
               return navigate();
             } else {
               const viewTransition = startViewTransition({
@@ -1273,10 +1284,13 @@ const QwikRouterProvider = component$((props) => {
       run();
     }
   });
+};
+const QwikRouterProvider = component$((props) => {
+  useQwikRouter(props);
   return /* @__PURE__ */ jsx(Slot, {});
 });
 const QwikCityProvider = QwikRouterProvider;
-const QwikRouterMockProvider = component$((props) => {
+const useQwikMockRouter = (props) => {
   const urlEnv = props.url ?? "http://localhost/";
   const url = new URL(urlEnv);
   const routeLocation = useStore({
@@ -1314,6 +1328,9 @@ const QwikRouterMockProvider = component$((props) => {
   useContextProvider(RouteStateContext, loaderState);
   useContextProvider(RouteActionContext, actionState);
   useContextProvider(RouteInternalContext, routeInternal);
+};
+const QwikRouterMockProvider = component$((props) => {
+  useQwikMockRouter(props);
   return /* @__PURE__ */ jsx(Slot, {});
 });
 const QwikCityMockProvider = QwikRouterMockProvider;
@@ -1534,8 +1551,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.
@@ -1965,7 +1981,52 @@ function omitProps(obj, keys) {
   }
   return omittedObj;
 }
+const createRenderer = (getOptions) => {
+  return (opts) => {
+    const { jsx: jsx2, options } = getOptions(opts);
+    return renderToStream(jsx2, options);
+  };
+};
+const DocumentHeadTags = component$((props) => {
+  let head = useDocumentHead();
+  if (props) {
+    head = {
+      ...head,
+      ...props
+    };
+  }
+  return /* @__PURE__ */ jsxs(Fragment, {
+    children: [
+      head.title && /* @__PURE__ */ jsx("title", {
+        children: head.title
+      }),
+      head.meta.map((m) => /* @__PURE__ */ jsx("meta", {
+        ...m
+      })),
+      head.links.map((l) => /* @__PURE__ */ jsx("link", {
+        ...l
+      })),
+      head.styles.map((s) => {
+        const props2 = s.props || s;
+        return /* @__PURE__ */ createElement("style", {
+          ...props2,
+          dangerouslySetInnerHTML: s.style || props2.dangerouslySetInnerHTML,
+          key: s.key
+        });
+      }),
+      head.scripts.map((s) => {
+        const props2 = s.props || s;
+        return /* @__PURE__ */ createElement("script", {
+          ...props2,
+          dangerouslySetInnerHTML: s.script || props2.dangerouslySetInnerHTML,
+          key: s.key
+        });
+      })
+    ]
+  });
+});
 export {
+  DocumentHeadTags,
   ErrorBoundary,
   Form,
   Link,
@@ -1977,6 +2038,7 @@ export {
   QwikRouterProvider,
   RouterOutlet,
   ServiceWorkerRegister,
+  createRenderer,
   globalAction$,
   globalActionQrl,
   omitProps,
@@ -1993,6 +2055,7 @@ export {
   useNavigate,
   usePreventNavigate$,
   usePreventNavigateQrl,
+  useQwikRouter,
   valibot$,
   valibotQrl,
   validator$,

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,