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

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

@@ -1,15 +1,16 @@
 // packages/qwik-router/src/middleware/netlify-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";
 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/node/index.cjs

@@ -24,8 +24,6 @@ __export(index_exports, {
   createQwikRouter: () => createQwikRouter
 });
 module.exports = __toCommonJS(index_exports);
-var import_qwik_router_not_found_paths = require("@qwik-router-not-found-paths");
-var import_qwik_router_static_paths = require("@qwik-router-static-paths");
 var import_internal = require("@qwik.dev/core/internal");
 var import_server = require("@qwik.dev/core/server");
 var import_request_handler = require("../request-handler/index.cjs");
@@ -209,10 +207,8 @@ var import_meta = {};
 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: import_internal._deserialize,
@@ -254,7 +250,7 @@ function createQwikRouter(opts) {
       if (!res.headersSent) {
         const origin = computeOrigin(req, opts);
         const url = getUrl(req, origin);
-        const notFoundHtml = (0, import_qwik_router_static_paths.isStaticPath)(req.method || "GET", url) ? "Not Found" : (0, import_qwik_router_not_found_paths.getNotFound)(url.pathname);
+        const notFoundHtml = (0, import_request_handler.isStaticPath)(req.method || "GET", url) ? "Not Found" : (0, import_request_handler.getNotFound)(url.pathname);
         res.writeHead(404, {
           "Content-Type": "text/html; charset=utf-8",
           "X-Not-Found": url.pathname
@@ -271,12 +267,12 @@ function createQwikRouter(opts) {
     try {
       const origin = computeOrigin(req, opts);
       const url = getUrl(req, origin);
-      if ((0, import_qwik_router_static_paths.isStaticPath)(req.method || "GET", url)) {
+      if ((0, import_request_handler.isStaticPath)(req.method || "GET", url)) {
         const pathname = url.pathname;
         let filePath;
         if ((0, import_node_path.basename)(pathname).includes(".")) {
           filePath = (0, import_node_path.join)(staticFolder, pathname);
-        } else if (opts.qwikRouterConfig.trailingSlash) {
+        } else if (!globalThis.__NO_TRAILING_SLASH__) {
           filePath = (0, import_node_path.join)(staticFolder, pathname + "index.html");
         } else {
           filePath = (0, import_node_path.join)(staticFolder, pathname, "index.html");

package/lib/middleware/node/index.mjs

@@ -1,9 +1,11 @@
 // packages/qwik-router/src/middleware/node/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 { requestHandler } from "../request-handler/index.mjs";
+import {
+  getNotFound,
+  isStaticPath,
+  requestHandler
+} from "../request-handler/index.mjs";
 import { createReadStream } from "node:fs";
 import { basename, extname, join } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -183,10 +185,8 @@ async function fromNodeHttp(url, req, res, mode, getClientConn) {
 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,
@@ -250,7 +250,7 @@ function createQwikRouter(opts) {
         let filePath;
         if (basename(pathname).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");