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

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

@@ -1,98 +1,85 @@
-import { setServerPlatform } from '@qwik.dev/core/server';
-import { _TextEncoderStream_polyfill, isStaticPath, mergeHeadersCookies, requestHandler, getErrorHtml } from '@qwik.dev/router/middleware/request-handler';
-import { isDev } from '@qwik.dev/core/build';
-
-function createQwikRouter(opts) {
-  try {
-    new globalThis.TextEncoderStream();
-  } catch {
-    globalThis.TextEncoderStream = _TextEncoderStream_polyfill;
-  }
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  async function onCloudflarePagesFetch(request, env, ctx) {
-    try {
-      const url = new URL(request.url);
-      if (isStaticPath(request.method, url)) {
-        return env.ASSETS.fetch(request);
-      }
-      const useCache = url.hostname !== "127.0.0.1" && url.hostname !== "localhost" && url.port === "" && request.method === "GET";
-      const cacheKey = new Request(url.href, request);
-      const cache = useCache ? await caches.open("custom:qwikrouter") : null;
-      if (cache) {
-        const cachedResponse = await cache.match(cacheKey);
-        if (cachedResponse) {
-          return cachedResponse;
-        }
-      }
-      const serverRequestEv = {
-        mode: "server",
-        locale: void 0,
-        url,
-        request,
-        env: {
-          get(key) {
-            return env[key];
-          }
-        },
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const { readable, writable } = new TransformStream();
-          const response = new Response(readable, {
-            status,
-            headers: mergeHeadersCookies(headers, cookies)
-          });
-          resolve(response);
-          return writable;
-        },
-        getClientConn: () => {
-          return {
-            ip: request.headers.get("CF-connecting-ip") || "",
-            country: request.headers.get("CF-IPCountry") || ""
-          };
-        },
-        platform: {
-          request,
-          env,
-          ctx
-        }
-      };
-      const handledResponse = await requestHandler(serverRequestEv, opts);
-      if (handledResponse) {
-        handledResponse.completion.then((completion) => {
-          if (completion) {
-            console.error(completion);
-          }
-        });
-        const response = await handledResponse.response;
-        if (response) {
-          if (response.ok && cache && response.headers.has("Cache-Control")) {
-            ctx.waitUntil(cache.put(cacheKey, response.clone()));
-          }
-          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": "cloudflare-pages"
-        }
-      });
-    }
-  }
-  return onCloudflarePagesFetch;
+import { isDev } from "@qwik.dev/core/build";
+import { setServerPlatform } from "@qwik.dev/core/server";
+import { _TextEncoderStream_polyfill, getErrorHtml, isStaticPath, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
+/** @public */ function createQwikRouter(opts) {
+	try {
+		new globalThis.TextEncoderStream();
+	} catch {
+		globalThis.TextEncoderStream = _TextEncoderStream_polyfill;
+	}
+	if (opts.manifest) setServerPlatform(opts.manifest);
+	async function onCloudflarePagesFetch(request, env, ctx) {
+		try {
+			const url = new URL(request.url);
+			if (isStaticPath(request.method, url)) return env.ASSETS.fetch(request);
+			const useCache = url.hostname !== "127.0.0.1" && url.hostname !== "localhost" && url.port === "" && request.method === "GET";
+			const cacheKey = new Request(url.href, request);
+			const cache = useCache ? await caches.open("custom:qwikrouter") : null;
+			if (cache) {
+				const cachedResponse = await cache.match(cacheKey);
+				if (cachedResponse) return cachedResponse;
+			}
+			const handledResponse = await requestHandler({
+				mode: "server",
+				locale: void 0,
+				url,
+				request,
+				env: { get(key) {
+					return env[key];
+				} },
+				getWritableStream: (status, headers, cookies, resolve) => {
+					const { readable, writable } = new TransformStream();
+					resolve(new Response(readable, {
+						status,
+						headers: mergeHeadersCookies(headers, cookies)
+					}));
+					return writable;
+				},
+				getClientConn: () => {
+					return {
+						ip: request.headers.get("CF-connecting-ip") || "",
+						country: request.headers.get("CF-IPCountry") || ""
+					};
+				},
+				platform: {
+					request,
+					env,
+					ctx
+				}
+			}, opts);
+			if (handledResponse) {
+				handledResponse.completion.then((completion) => {
+					if (completion) console.error(completion);
+				});
+				const response = await handledResponse.response;
+				if (response) {
+					if (response.ok && cache && response.headers.has("Cache-Control")) ctx.waitUntil(cache.put(cacheKey, response.clone()));
+					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": "cloudflare-pages"
+				}
+			});
+		}
+	}
+	return onCloudflarePagesFetch;
 }
-const createQwikCity = createQwikRouter;
-
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/middleware/deno/index.mjs

@@ -1,129 +1,108 @@
-import { setServerPlatform } from '@qwik.dev/core/server';
-import { isStaticPath, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
-import { M as MIME_TYPES, n as normalizeRequestUrl } from '../../chunks/url.mjs';
-import { l as limitRequestBody } from '../../chunks/request-body-limit.mjs';
-import { join, fromFileUrl, extname } from 'https://deno.land/std/path/mod.ts';
-import { isDev } from '@qwik.dev/core/build';
-
+import { n as MIME_TYPES, t as normalizeRequestUrl } from "../../chunks/url.mjs";
+import { r as limitRequestBody } from "../../chunks/request-body-limit.mjs";
+import { isDev } from "@qwik.dev/core/build";
+import { setServerPlatform } from "@qwik.dev/core/server";
+import { isStaticPath, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
+import { extname, fromFileUrl, join } from "https://deno.land/std/path/mod.ts";
 function getRequestUrl(request, opts, info) {
-  const url = new URL(request.url);
-  const origin = opts.getOrigin?.(request, info) ?? Deno.env?.get?.("ORIGIN");
-  if (!origin) {
-    return url;
-  }
-  return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
+	const url = new URL(request.url);
+	const origin = opts.getOrigin?.(request, info) ?? Deno.env?.get?.("ORIGIN");
+	if (!origin) return url;
+	return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
-function createQwikRouter(opts) {
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  const staticFolder = opts.static?.root ?? join(fromFileUrl(import.meta.url), "..", "..", "dist");
-  async function router(request, info) {
-    try {
-      const url = getRequestUrl(request, opts, info);
-      const serverRequestEv = {
-        mode: "server",
-        locale: void 0,
-        url,
-        // @ts-ignore
-        env: Deno.env,
-        request: limitRequestBody(request, opts.requestBodyLimit),
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const { readable, writable } = new TransformStream();
-          const response = new Response(readable, {
-            status,
-            headers: mergeHeadersCookies(headers, cookies)
-          });
-          resolve(response);
-          return writable;
-        },
-        platform: {
-          ssr: true
-        },
-        getClientConn: () => {
-          return opts.getClientConn ? opts.getClientConn(request, info) : {
-            ip: info.remoteAddr.hostname
-          };
-        }
-      };
-      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;
-        }
-      }
-      return null;
-    } 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": "deno-server"
-        }
-      });
-    }
-  }
-  const notFound = async (_request) => {
-    return null;
-  };
-  const openStaticFile = async (url) => {
-    const pathname = url.pathname;
-    const fileName = pathname.slice(url.pathname.lastIndexOf("/"));
-    let filePath;
-    if (fileName.includes(".")) {
-      filePath = join(staticFolder, pathname);
-    } else if (!globalThis.__NO_TRAILING_SLASH__) {
-      filePath = join(staticFolder, pathname + "index.html");
-    } else {
-      filePath = join(staticFolder, pathname, "index.html");
-    }
-    return {
-      filePath,
-      // @ts-ignore
-      content: await Deno.open(filePath, {
-        read: true
-      })
-    };
-  };
-  const staticFile = async (request) => {
-    try {
-      const url = getRequestUrl(request, opts);
-      if (isStaticPath(request.method || "GET", url)) {
-        const { filePath, content } = await openStaticFile(url);
-        const ext = extname(filePath).replace(/^\./, "");
-        return new Response(content.readable, {
-          status: 200,
-          headers: {
-            "content-type": MIME_TYPES[ext] || "text/plain; charset=utf-8",
-            "Cache-Control": opts.static?.cacheControl || "max-age=3600"
-          }
-        });
-      }
-      return null;
-    } 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": "deno-server"
-        }
-      });
-    }
-  };
-  return {
-    router,
-    notFound,
-    staticFile
-  };
+/** @public */ function createQwikRouter(opts) {
+	if (opts.manifest) setServerPlatform(opts.manifest);
+	const staticFolder = opts.static?.root ?? join(fromFileUrl(import.meta.url), "..", "..", "dist");
+	async function router(request, info) {
+		try {
+			const serverRequestEv = {
+				mode: "server",
+				locale: void 0,
+				url: getRequestUrl(request, opts, info),
+				env: Deno.env,
+				request: limitRequestBody(request, opts.requestBodyLimit),
+				getWritableStream: (status, headers, cookies, resolve) => {
+					const { readable, writable } = new TransformStream();
+					resolve(new Response(readable, {
+						status,
+						headers: mergeHeadersCookies(headers, cookies)
+					}));
+					return writable;
+				},
+				platform: { ssr: true },
+				getClientConn: () => {
+					return opts.getClientConn ? opts.getClientConn(request, info) : { ip: info.remoteAddr.hostname };
+				}
+			};
+			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;
+			}
+			return null;
+		} 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": "deno-server"
+				}
+			});
+		}
+	}
+	/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_request) => {
+		return null;
+	};
+	const openStaticFile = async (url) => {
+		const pathname = url.pathname;
+		const fileName = pathname.slice(url.pathname.lastIndexOf("/"));
+		let filePath;
+		if (fileName.includes(".")) filePath = join(staticFolder, pathname);
+		else if (!globalThis.__NO_TRAILING_SLASH__) filePath = join(staticFolder, pathname + "index.html");
+		else filePath = join(staticFolder, pathname, "index.html");
+		return {
+			filePath,
+			content: await Deno.open(filePath, { read: true })
+		};
+	};
+	const staticFile = async (request) => {
+		try {
+			const url = getRequestUrl(request, opts);
+			if (isStaticPath(request.method || "GET", url)) {
+				const { filePath, content } = await openStaticFile(url);
+				const ext = extname(filePath).replace(/^\./, "");
+				return new Response(content.readable, {
+					status: 200,
+					headers: {
+						"content-type": MIME_TYPES[ext] || "text/plain; charset=utf-8",
+						"Cache-Control": opts.static?.cacheControl || "max-age=3600"
+					}
+				});
+			}
+			return null;
+		} 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": "deno-server"
+				}
+			});
+		}
+	};
+	return {
+		router,
+		notFound,
+		staticFile
+	};
 }
-const createQwikCity = createQwikRouter;
-
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/middleware/firebase/index.mjs

@@ -1,27 +1,23 @@
-import { createQwikRouter as createQwikRouter$1 } from '@qwik.dev/router/middleware/node';
-
-function createQwikRouter(opts) {
-  const { staticFile, router } = createQwikRouter$1({
-    render: opts.render,
-    manifest: opts.manifest,
-    static: {
-      cacheControl: "public, max-age=31557600"
-    },
-    getOrigin(req) {
-      if (process.env.IS_OFFLINE) {
-        return `http://${req.headers.host}`;
-      }
-      return null;
-    }
-  });
-  const qwikApp = (req, res) => {
-    return staticFile(req, res, () => {
-      router(req, res, () => {
-      });
-    });
-  };
-  return qwikApp;
+import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middleware/node";
+/** @public */ function createQwikRouter(opts) {
+	const { staticFile, router } = createQwikRouter$1({
+		render: opts.render,
+		manifest: opts.manifest,
+		static: { cacheControl: "public, max-age=31557600" },
+		getOrigin(req) {
+			if (process.env.IS_OFFLINE) return `http://${req.headers.host}`;
+			return null;
+		}
+	});
+	const qwikApp = (req, res) => {
+		return staticFile(req, res, () => {
+			router(req, res, () => {});
+		});
+	};
+	return qwikApp;
 }
-const createQwikCity = createQwikRouter;
-
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

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

@@ -1,73 +1,65 @@
-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';
-
-function createQwikRouter(opts) {
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  async function onNetlifyEdgeRequest(request, context) {
-    try {
-      const url = new URL(request.url);
-      if (isStaticPath(request.method, url) || url.pathname.startsWith("/.netlify")) {
-        return context.next();
-      }
-      const serverRequestEv = {
-        mode: "server",
-        locale: void 0,
-        url,
-        env: Deno.env,
-        request,
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const { readable, writable } = new TransformStream();
-          const response = new Response(readable, {
-            status,
-            headers: mergeHeadersCookies(headers, cookies)
-          });
-          resolve(response);
-          return writable;
-        },
-        getClientConn: () => {
-          return {
-            ip: context.ip,
-            country: context.geo.country?.code
-          };
-        },
-        platform: context
-      };
-      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": "netlify-edge"
-        }
-      });
-    }
-  }
-  return onNetlifyEdgeRequest;
+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";
+/** @public */ function createQwikRouter(opts) {
+	if (opts.manifest) setServerPlatform(opts.manifest);
+	async function onNetlifyEdgeRequest(request, context) {
+		try {
+			const url = new URL(request.url);
+			if (isStaticPath(request.method, url) || url.pathname.startsWith("/.netlify")) return context.next();
+			const serverRequestEv = {
+				mode: "server",
+				locale: void 0,
+				url,
+				env: Deno.env,
+				request,
+				getWritableStream: (status, headers, cookies, resolve) => {
+					const { readable, writable } = new TransformStream();
+					resolve(new Response(readable, {
+						status,
+						headers: mergeHeadersCookies(headers, cookies)
+					}));
+					return writable;
+				},
+				getClientConn: () => {
+					return {
+						ip: context.ip,
+						country: context.geo.country?.code
+					};
+				},
+				platform: context
+			};
+			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": "netlify-edge"
+				}
+			});
+		}
+	}
+	return onNetlifyEdgeRequest;
 }
-const createQwikCity = createQwikRouter;
-
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };