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

package/lib/middleware/request-handler/index.mjs

@@ -1,140 +1,117 @@
-import { F as FULLPATH_HEADER, R as ROUTE_PATH_HEADER, l as loadRoute } from '../../chunks/head.qwik.mjs';
-export { _ as _asyncRequestStore } from '../../chunks/head.qwik.mjs';
-import { isDev } from '@qwik.dev/core';
-import { d as devPreloadedRouteLoaders } from '../../chunks/dev-preloaded-route-loader.mjs';
-import { r as recognizeRequest, t as trimRecognizedInternalPathname, I as IsQLoader, a as resolveValidInternalFullPathname, b as trimInternalPathname } from '../../chunks/request-path.mjs';
-import { r as runQwikRouter, a as resolveRequestHandlers, b as renderQwikMiddleware } from '../../chunks/user-response.mjs';
-export { R as RewriteMessage, c as clearLoaderCache, d as clearSsrCache, g as getErrorHtml, m as mergeHeadersCookies } from '../../chunks/user-response.mjs';
-export { A as AbortMessage, R as RedirectMessage, S as ServerError } from '../../chunks/server-error.mjs';
-
-let qwikRouterConfig;
+import { Y as _asyncRequestStore, d as loadRoute } from "../../chunks/head.qwik.mjs";
+import { c as resolveValidInternalFullPathname, l as trimInternalPathname, s as recognizeRequest, u as trimRecognizedInternalPathname } from "../../chunks/request-path.mjs";
+import { i as RedirectMessage, r as AbortMessage, t as ServerError } from "../../chunks/server-error.mjs";
+import { t as devPreloadedRouteLoaders } from "../../chunks/dev-preloaded-route-loader.mjs";
+import { a as clearLoaderCache, c as mergeHeadersCookies, i as resolveRequestHandlers, n as getErrorHtml, o as clearSsrCache, r as renderQwikMiddleware, s as RewriteMessage, t as runQwikRouter } from "../../chunks/user-response.mjs";
+import { isDev } from "@qwik.dev/core";
+var qwikRouterConfig;
 async function getConfig() {
-  if (isDev) {
-    return await import('@qwik-router-config');
-  }
-  if (!qwikRouterConfig) {
-    qwikRouterConfig = await import('@qwik-router-config');
-  }
-  return qwikRouterConfig;
+	if (isDev) return await import("@qwik-router-config");
+	if (!qwikRouterConfig) qwikRouterConfig = await import("@qwik-router-config");
+	return qwikRouterConfig;
 }
 function getRequestHandlerPathname(serverRequestEv, isDevRequest = isDev) {
-  const recognized = recognizeRequest(serverRequestEv.url.pathname);
-  if (!recognized) {
-    return serverRequestEv.url.pathname;
-  }
-  const loaderPathname = trimRecognizedInternalPathname(serverRequestEv.url.pathname, recognized);
-  if (recognized.type !== IsQLoader) {
-    return loaderPathname;
-  }
-  const routePath = serverRequestEv.request.headers.get(FULLPATH_HEADER) ?? (isDevRequest ? serverRequestEv.request.headers.get(ROUTE_PATH_HEADER) : null);
-  return resolveValidInternalFullPathname(loaderPathname, routePath) ?? loaderPathname;
+	const recognized = recognizeRequest(serverRequestEv.url.pathname);
+	if (!recognized) return serverRequestEv.url.pathname;
+	const loaderPathname = trimRecognizedInternalPathname(serverRequestEv.url.pathname, recognized);
+	if (recognized.type !== "@isQLoader") return loaderPathname;
+	const routePath = serverRequestEv.request.headers.get("X-Qwik-fullpath") ?? (isDevRequest ? serverRequestEv.request.headers.get("X-Qwik-route-path") : null);
+	return resolveValidInternalFullPathname(loaderPathname, routePath) ?? loaderPathname;
 }
-async function loadRequestHandlers(qwikRouterConfig2, pathname, method, checkOrigin, renderFn, serverRequestEv) {
-  const { routes, serverPlugins, cacheModules } = qwikRouterConfig2;
-  const loadedRoute = await loadRoute(routes, cacheModules, pathname);
-  const loader = isDev ? devPreloadedRouteLoaders.get(serverRequestEv.request) : void 0;
-  const lastModule = loadedRoute.$mods$[loadedRoute.$mods$.length - 1];
-  if (loader && lastModule) {
-    loadedRoute.$mods$[loadedRoute.$mods$.length - 1] = Object.assign({}, lastModule, {
-      __preloadedRouteLoader: loader
-    });
-  }
-  const requestHandlers = resolveRequestHandlers(serverPlugins, loadedRoute, method, checkOrigin, renderQwikMiddleware(renderFn));
-  return {
-    loadedRoute,
-    requestHandlers
-  };
+async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrigin, renderFn, serverRequestEv) {
+	const { routes, serverPlugins, cacheModules } = qwikRouterConfig;
+	const loadedRoute = await loadRoute(routes, cacheModules, pathname);
+	const loader = isDev ? devPreloadedRouteLoaders.get(serverRequestEv.request) : void 0;
+	const lastModule = loadedRoute.$mods$[loadedRoute.$mods$.length - 1];
+	if (loader && lastModule) loadedRoute.$mods$[loadedRoute.$mods$.length - 1] = Object.assign({}, lastModule, { __preloadedRouteLoader: loader });
+	return {
+		loadedRoute,
+		requestHandlers: resolveRequestHandlers(serverPlugins, loadedRoute, method, checkOrigin, renderQwikMiddleware(renderFn))
+	};
 }
-async function requestHandler(serverRequestEv, opts) {
-  const { render, checkOrigin } = opts;
-  const config = await getConfig();
-  const pathname = getRequestHandlerPathname(serverRequestEv);
-  if (pathname === "/.well-known" || pathname.startsWith("/.well-known/")) {
-    return null;
-  }
-  const { loadedRoute, requestHandlers } = await loadRequestHandlers(config, pathname, serverRequestEv.request.method, checkOrigin ?? true, render, serverRequestEv);
-  if (config.fallthrough && loadedRoute.$notFound$) {
-    return null;
-  }
-  const rebuildRouteInfo = async (url) => {
-    const cleanPathname = trimInternalPathname(url.pathname);
-    return loadRequestHandlers(config, cleanPathname, serverRequestEv.request.method, checkOrigin ?? true, render, serverRequestEv);
-  };
-  return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, config.basePathname);
+/**
+* The request handler for QwikRouter. Called by every adapter.
+*
+* @public
+*/ async function requestHandler(serverRequestEv, opts) {
+	const { render, checkOrigin } = opts;
+	const config = await getConfig();
+	const pathname = getRequestHandlerPathname(serverRequestEv);
+	if (pathname === "/.well-known" || pathname.startsWith("/.well-known/")) return null;
+	const { loadedRoute, requestHandlers } = await loadRequestHandlers(config, pathname, serverRequestEv.request.method, checkOrigin ?? true, render, serverRequestEv);
+	if (config.fallthrough && loadedRoute.$notFound$) return null;
+	const rebuildRouteInfo = async (url) => {
+		const cleanPathname = trimInternalPathname(url.pathname);
+		return loadRequestHandlers(config, cleanPathname, serverRequestEv.request.method, checkOrigin ?? true, render, serverRequestEv);
+	};
+	return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, config.basePathname);
 }
-
-const staticPaths = /* @__PURE__ */ new Set([
-  "__QWIK_ROUTER_STATIC_PATHS_ARRAY__"
-]);
-function isStaticPath(method, url) {
-  if (method.toUpperCase() !== "GET") {
-    return false;
-  }
-  const p = url.pathname;
-  if (p.startsWith("/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/")) {
-    return true;
-  }
-  if (p.startsWith("/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/")) {
-    return true;
-  }
-  return staticPaths.has(p);
+var staticPaths = /* @__PURE__ */ new Set(["__QWIK_ROUTER_STATIC_PATHS_ARRAY__"]);
+/**
+* Decide whether a given request path is a static path, for optimizing file access.
+*
+* @internal
+*/ function isStaticPath(method, url) {
+	if (method.toUpperCase() !== "GET") return false;
+	const p = url.pathname;
+	if (p.startsWith("/" + (globalThis.__QWIK_BUILD_DIR__ || "build") + "/")) return true;
+	if (p.startsWith("/" + (globalThis.__QWIK_ASSETS_DIR__ || "assets") + "/")) return true;
+	return staticPaths.has(p);
 }
-
-class _TextEncoderStream_polyfill {
-  #pendingHighSurrogate = null;
-  #handle = new TextEncoder();
-  #transform = new TransformStream({
-    transform: (chunk, controller) => {
-      chunk = String(chunk);
-      let finalChunk = "";
-      for (let i = 0; i < chunk.length; i++) {
-        const item = chunk[i];
-        const codeUnit = item.charCodeAt(0);
-        if (this.#pendingHighSurrogate !== null) {
-          const highSurrogate = this.#pendingHighSurrogate;
-          this.#pendingHighSurrogate = null;
-          if (56320 <= codeUnit && codeUnit <= 57343) {
-            finalChunk += highSurrogate + item;
-            continue;
-          }
-          finalChunk += "�";
-        }
-        if (55296 <= codeUnit && codeUnit <= 56319) {
-          this.#pendingHighSurrogate = item;
-          continue;
-        }
-        if (56320 <= codeUnit && codeUnit <= 57343) {
-          finalChunk += "�";
-          continue;
-        }
-        finalChunk += item;
-      }
-      if (finalChunk) {
-        controller.enqueue(this.#handle.encode(finalChunk));
-      }
-    },
-    flush: (controller) => {
-      if (this.#pendingHighSurrogate !== null) {
-        controller.enqueue(new Uint8Array([
-          239,
-          191,
-          189
-        ]));
-      }
-    }
-  });
-  get encoding() {
-    return this.#handle.encoding;
-  }
-  get readable() {
-    return this.#transform.readable;
-  }
-  get writable() {
-    return this.#transform.writable;
-  }
-  get [Symbol.toStringTag]() {
-    return "TextEncoderStream";
-  }
-}
-
-export { _TextEncoderStream_polyfill, isStaticPath, requestHandler };
+/**
+* TextEncoderStream polyfill based on Node.js' implementation
+* https://github.com/nodejs/node/blob/3f3226c8e363a5f06c1e6a37abd59b6b8c1923f1/lib/internal/webstreams/encoding.js#L38-L119
+* (MIT License)
+*/ /** @internal */ var _TextEncoderStream_polyfill = class {
+	#pendingHighSurrogate = null;
+	#handle = new TextEncoder();
+	#transform = new TransformStream({
+		transform: (chunk, controller) => {
+			chunk = String(chunk);
+			let finalChunk = "";
+			for (let i = 0; i < chunk.length; i++) {
+				const item = chunk[i];
+				const codeUnit = item.charCodeAt(0);
+				if (this.#pendingHighSurrogate !== null) {
+					const highSurrogate = this.#pendingHighSurrogate;
+					this.#pendingHighSurrogate = null;
+					if (56320 <= codeUnit && codeUnit <= 57343) {
+						finalChunk += highSurrogate + item;
+						continue;
+					}
+					finalChunk += "�";
+				}
+				if (55296 <= codeUnit && codeUnit <= 56319) {
+					this.#pendingHighSurrogate = item;
+					continue;
+				}
+				if (56320 <= codeUnit && codeUnit <= 57343) {
+					finalChunk += "�";
+					continue;
+				}
+				finalChunk += item;
+			}
+			if (finalChunk) controller.enqueue(this.#handle.encode(finalChunk));
+		},
+		flush: (controller) => {
+			if (this.#pendingHighSurrogate !== null) controller.enqueue(new Uint8Array([
+				239,
+				191,
+				189
+			]));
+		}
+	});
+	get encoding() {
+		return this.#handle.encoding;
+	}
+	get readable() {
+		return this.#transform.readable;
+	}
+	get writable() {
+		return this.#transform.writable;
+	}
+	get [Symbol.toStringTag]() {
+		return "TextEncoderStream";
+	}
+};
+export { AbortMessage, RedirectMessage, RewriteMessage, ServerError, _TextEncoderStream_polyfill, _asyncRequestStore, clearLoaderCache, clearSsrCache, getErrorHtml, isStaticPath, mergeHeadersCookies, requestHandler };

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

@@ -1,100 +1,84 @@
-import { setServerPlatform } from '@qwik.dev/core/server';
-import { isStaticPath, mergeHeadersCookies, requestHandler, getErrorHtml } from '@qwik.dev/router/middleware/request-handler';
-import { isDev } from '@qwik.dev/core/build';
-
-const COUNTRY_HEADER_NAME = "x-vercel-ip-country";
-const IP_HEADER_NAME = "x-real-ip";
-const VERCEL_COOKIE = "__vdpl";
-const VERCEL_SKEW_PROTECTION_ENABLED = "VERCEL_SKEW_PROTECTION_ENABLED";
-const VERCEL_DEPLOYMENT_ID = "VERCEL_DEPLOYMENT_ID";
-const BASE_URL = "BASE_URL";
-function createQwikRouter(opts) {
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  async function onVercelEdgeRequest(request) {
-    try {
-      const url = new URL(request.url);
-      if (isStaticPath(request.method, url)) {
-        return new Response(null, {
-          headers: {
-            "x-middleware-next": "1"
-          }
-        });
-      }
-      const p = (() => globalThis.process)();
-      const serverRequestEv = {
-        mode: "server",
-        locale: void 0,
-        url,
-        request,
-        env: {
-          get(key) {
-            return p.env[key];
-          }
-        },
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const { readable, writable } = new TransformStream();
-          if (serverRequestEv.env.get(VERCEL_SKEW_PROTECTION_ENABLED)) {
-            const deploymentId = serverRequestEv.env.get(VERCEL_DEPLOYMENT_ID) || "";
-            const baseUrl = serverRequestEv.env.get(BASE_URL) || "/";
-            if (request.headers.has("Sec-Fetch-Dest")) {
-              cookies.set(VERCEL_COOKIE, deploymentId, {
-                path: baseUrl,
-                secure: true,
-                sameSite: true,
-                httpOnly: true
-              });
-            }
-          }
-          const response = new Response(readable, {
-            status,
-            headers: mergeHeadersCookies(headers, cookies)
-          });
-          resolve(response);
-          return writable;
-        },
-        platform: {},
-        getClientConn: () => {
-          return {
-            ip: request.headers.get(IP_HEADER_NAME) ?? void 0,
-            country: request.headers.get(COUNTRY_HEADER_NAME) ?? void 0
-          };
-        }
-      };
-      const handledResponse = await requestHandler(serverRequestEv, opts);
-      if (handledResponse) {
-        handledResponse.completion.then((completion) => {
-          if (completion) {
-            console.error(completion);
-          }
-        });
-        const response = await handledResponse.response;
-        if (response) {
-          return response;
-        }
-      }
-      const notFoundHtml = !request.headers.get("accept")?.includes("text/html") || isStaticPath(request.method || "GET", url) ? "Not Found" : getErrorHtml(404, "Not Found");
-      return new Response(notFoundHtml, {
-        status: 404,
-        headers: {
-          "Content-Type": "text/html; charset=utf-8",
-          "X-Not-Found": url.pathname
-        }
-      });
-    } catch (e) {
-      console.error(e);
-      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
-        status: 500,
-        headers: {
-          "Content-Type": "text/plain; charset=utf-8",
-          "X-Error": "vercel-edge"
-        }
-      });
-    }
-  }
-  return onVercelEdgeRequest;
+import { isDev } from "@qwik.dev/core/build";
+import { setServerPlatform } from "@qwik.dev/core/server";
+import { getErrorHtml, isStaticPath, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
+var COUNTRY_HEADER_NAME = "x-vercel-ip-country";
+var IP_HEADER_NAME = "x-real-ip";
+var VERCEL_COOKIE = "__vdpl";
+var VERCEL_SKEW_PROTECTION_ENABLED = "VERCEL_SKEW_PROTECTION_ENABLED";
+var VERCEL_DEPLOYMENT_ID = "VERCEL_DEPLOYMENT_ID";
+var BASE_URL = "BASE_URL";
+/** @public */ function createQwikRouter(opts) {
+	if (opts.manifest) setServerPlatform(opts.manifest);
+	async function onVercelEdgeRequest(request) {
+		try {
+			const url = new URL(request.url);
+			if (isStaticPath(request.method, url)) return new Response(null, { headers: { "x-middleware-next": "1" } });
+			const p = (() => globalThis.process)();
+			const serverRequestEv = {
+				mode: "server",
+				locale: void 0,
+				url,
+				request,
+				env: { get(key) {
+					return p.env[key];
+				} },
+				getWritableStream: (status, headers, cookies, resolve) => {
+					const { readable, writable } = new TransformStream();
+					if (serverRequestEv.env.get(VERCEL_SKEW_PROTECTION_ENABLED)) {
+						const deploymentId = serverRequestEv.env.get(VERCEL_DEPLOYMENT_ID) || "";
+						const baseUrl = serverRequestEv.env.get(BASE_URL) || "/";
+						if (request.headers.has("Sec-Fetch-Dest")) cookies.set(VERCEL_COOKIE, deploymentId, {
+							path: baseUrl,
+							secure: true,
+							sameSite: true,
+							httpOnly: true
+						});
+					}
+					resolve(new Response(readable, {
+						status,
+						headers: mergeHeadersCookies(headers, cookies)
+					}));
+					return writable;
+				},
+				platform: {},
+				getClientConn: () => {
+					return {
+						ip: request.headers.get(IP_HEADER_NAME) ?? void 0,
+						country: request.headers.get(COUNTRY_HEADER_NAME) ?? void 0
+					};
+				}
+			};
+			const handledResponse = await requestHandler(serverRequestEv, opts);
+			if (handledResponse) {
+				handledResponse.completion.then((completion) => {
+					if (completion) console.error(completion);
+				});
+				const response = await handledResponse.response;
+				if (response) return response;
+			}
+			const notFoundHtml = !request.headers.get("accept")?.includes("text/html") || isStaticPath(request.method || "GET", url) ? "Not Found" : getErrorHtml(404, "Not Found");
+			return new Response(notFoundHtml, {
+				status: 404,
+				headers: {
+					"Content-Type": "text/html; charset=utf-8",
+					"X-Not-Found": url.pathname
+				}
+			});
+		} catch (e) {
+			console.error(e);
+			return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
+				status: 500,
+				headers: {
+					"Content-Type": "text/plain; charset=utf-8",
+					"X-Error": "vercel-edge"
+				}
+			});
+		}
+	}
+	return onVercelEdgeRequest;
 }
-const createQwikCity = createQwikRouter;
-
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/service-worker/index.mjs

@@ -1,4 +1,13 @@
-const setupServiceWorker = () => {
-};
-
+/**
+* @deprecated This is no longer needed, Qwik now automatically embeds preloading logic into the
+*   application.
+*
+*   If your service-worker.ts file contains no custom code, you should deploy to production until
+*   you're sure that all users picked up the new version, then you can remove it and also remove
+*   the `<ServiceWorkerRegister />` component from your `Root.tsx`.
+*
+*   If you do have custom service worker logic, you should keep the `service-worker.ts` file and
+*   `<ServiceWorkerRegister />` component, but remove the `setupServiceWorker()` call.
+* @public
+*/ var setupServiceWorker = () => {};
 export { setupServiceWorker };