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

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

@@ -1,54 +1,46 @@
-import { createQwikRouter as createQwikRouter$1 } from '@qwik.dev/router/middleware/node';
-import { e as ensureSlash } from '../../chunks/pathname.mjs';
-
-function createQwikRouter(opts) {
-  try {
-    const { router, staticFile } = 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 fixPath = (pathT) => {
-      if (!globalThis.__NO_TRAILING_SLASH__) {
-        const url = new URL(pathT, "http://aws-qwik.local");
-        if (url.pathname.includes(".", url.pathname.lastIndexOf("/"))) {
-          return pathT;
-        }
-        if (!url.pathname.endsWith("/")) {
-          return ensureSlash(url.pathname) + url.search;
-        }
-      }
-      return pathT;
-    };
-    const handle = (req, res) => {
-      req.url = fixPath(req.url);
-      staticFile(req, res, () => {
-        router(req, res, () => {
-        });
-      });
-    };
-    const notFound = async (_req, _res, next) => {
-      next();
-    };
-    return {
-      fixPath,
-      router,
-      staticFile,
-      notFound,
-      handle
-    };
-  } catch (err) {
-    throw new Error(err.message);
-  }
+import { t as ensureSlash } from "../../chunks/pathname.mjs";
+import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middleware/node";
+/** @public */ function createQwikRouter(opts) {
+	try {
+		const { router, staticFile } = 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 fixPath = (pathT) => {
+			if (!globalThis.__NO_TRAILING_SLASH__) {
+				const url = new URL(pathT, "http://aws-qwik.local");
+				if (url.pathname.includes(".", url.pathname.lastIndexOf("/"))) return pathT;
+				if (!url.pathname.endsWith("/")) return ensureSlash(url.pathname) + url.search;
+			}
+			return pathT;
+		};
+		const handle = (req, res) => {
+			req.url = fixPath(req.url);
+			staticFile(req, res, () => {
+				router(req, res, () => {});
+			});
+		};
+		/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_req, _res, next) => {
+			next();
+		};
+		return {
+			fixPath,
+			router,
+			staticFile,
+			notFound,
+			handle
+		};
+	} catch (err) {
+		throw new Error(err.message);
+	}
 }
-const createQwikCity = createQwikRouter;
-
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

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

@@ -1,96 +1,87 @@
-import { setServerPlatform } from '@qwik.dev/core/server';
-import { requestHandler, isStaticPath, getErrorHtml } from '@qwik.dev/router/middleware/request-handler';
-import { parseString } from 'set-cookie-parser';
-
-function createQwikRouter(opts) {
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  async function onAzureSwaRequest(context, req) {
-    try {
-      const url = new URL(req.headers["x-ms-original-url"]);
-      const options = {
-        method: req.method || "GET",
-        headers: req.headers,
-        body: req.bufferBody || req.rawBody || req.body
-      };
-      const serverRequestEv = {
-        mode: "server",
-        locale: void 0,
-        url,
-        platform: context,
-        env: {
-          get(key) {
-            return process.env[key];
-          }
-        },
-        request: new Request(url, options),
-        getWritableStream: (status, headers, cookies, resolve) => {
-          const chunks = [];
-          let bodyLength = 0;
-          const response = {
-            status,
-            headers: {},
-            cookies: cookies.headers().map((header) => parseString(header))
-          };
-          headers.forEach((value, key) => response.headers[key] = value);
-          return new WritableStream({
-            write(chunk) {
-              chunks.push(chunk.slice());
-              bodyLength += chunk.length;
-            },
-            close() {
-              const body = new Uint8Array(bodyLength);
-              let offset = 0;
-              for (const chunk of chunks) {
-                body.set(chunk, offset);
-                offset += chunk.length;
-              }
-              response.body = body;
-              resolve(response);
-            }
-          });
-        },
-        getClientConn: () => {
-          return {
-            ip: req.headers["x-forwarded-client-Ip"],
-            country: void 0
-          };
-        }
-      };
-      const handledResponse = await requestHandler(serverRequestEv, opts);
-      if (handledResponse) {
-        handledResponse.completion.then((err) => {
-          if (err) {
-            console.error(err);
-          }
-        });
-        const response = await handledResponse.response;
-        if (response) {
-          return response;
-        }
-      }
-      const notFoundHtml = !req.headers.accept?.includes("text/html") || isStaticPath(req.method || "GET", url) ? "Not Found" : getErrorHtml(404, "Not Found");
-      return {
-        status: 404,
-        headers: {
-          "Content-Type": "text/html; charset=utf-8",
-          "X-Not-Found": url.pathname
-        },
-        body: notFoundHtml
-      };
-    } catch (e) {
-      console.error(e);
-      return {
-        status: 500,
-        headers: {
-          "Content-Type": "text/plain; charset=utf-8"
-        }
-      };
-    }
-  }
-  return onAzureSwaRequest;
+import { setServerPlatform } from "@qwik.dev/core/server";
+import { getErrorHtml, isStaticPath, requestHandler } from "@qwik.dev/router/middleware/request-handler";
+import { parseString } from "set-cookie-parser";
+/** @public */ function createQwikRouter(opts) {
+	if (opts.manifest) setServerPlatform(opts.manifest);
+	async function onAzureSwaRequest(context, req) {
+		try {
+			const url = new URL(req.headers["x-ms-original-url"]);
+			const options = {
+				method: req.method || "GET",
+				headers: req.headers,
+				body: req.bufferBody || req.rawBody || req.body
+			};
+			const serverRequestEv = {
+				mode: "server",
+				locale: void 0,
+				url,
+				platform: context,
+				env: { get(key) {
+					return process.env[key];
+				} },
+				request: new Request(url, options),
+				getWritableStream: (status, headers, cookies, resolve) => {
+					const chunks = [];
+					let bodyLength = 0;
+					const response = {
+						status,
+						headers: {},
+						cookies: cookies.headers().map((header) => parseString(header))
+					};
+					headers.forEach((value, key) => response.headers[key] = value);
+					return new WritableStream({
+						write(chunk) {
+							chunks.push(chunk.slice());
+							bodyLength += chunk.length;
+						},
+						close() {
+							const body = new Uint8Array(bodyLength);
+							let offset = 0;
+							for (const chunk of chunks) {
+								body.set(chunk, offset);
+								offset += chunk.length;
+							}
+							response.body = body;
+							resolve(response);
+						}
+					});
+				},
+				getClientConn: () => {
+					return {
+						ip: req.headers["x-forwarded-client-Ip"],
+						country: void 0
+					};
+				}
+			};
+			const handledResponse = await requestHandler(serverRequestEv, opts);
+			if (handledResponse) {
+				handledResponse.completion.then((err) => {
+					if (err) console.error(err);
+				});
+				const response = await handledResponse.response;
+				if (response) return response;
+			}
+			const notFoundHtml = !req.headers.accept?.includes("text/html") || isStaticPath(req.method || "GET", url) ? "Not Found" : getErrorHtml(404, "Not Found");
+			return {
+				status: 404,
+				headers: {
+					"Content-Type": "text/html; charset=utf-8",
+					"X-Not-Found": url.pathname
+				},
+				body: notFoundHtml
+			};
+		} catch (e) {
+			console.error(e);
+			return {
+				status: 500,
+				headers: { "Content-Type": "text/plain; charset=utf-8" }
+			};
+		}
+	}
+	return onAzureSwaRequest;
 }
-const createQwikCity = createQwikRouter;
-
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/middleware/bun/index.mjs

@@ -1,142 +1,122 @@
-import { isDev } from '@qwik.dev/core/build';
-import { setServerPlatform } from '@qwik.dev/core/server';
-import { _TextEncoderStream_polyfill, isStaticPath, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
-import { join, extname } from 'node:path';
-import { M as MIME_TYPES, n as normalizeRequestUrl } from '../../chunks/url.mjs';
-
+import { n as MIME_TYPES, t as normalizeRequestUrl } from "../../chunks/url.mjs";
+import { isDev } from "@qwik.dev/core/build";
+import { setServerPlatform } from "@qwik.dev/core/server";
+import { extname, join } from "node:path";
+import { _TextEncoderStream_polyfill, isStaticPath, mergeHeadersCookies, requestHandler } from "@qwik.dev/router/middleware/request-handler";
 function getRequestUrl(request, opts) {
-  const url = new URL(request.url);
-  const origin = opts.getOrigin?.(request) ?? Bun.env.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) ?? Bun.env.ORIGIN;
+	if (!origin) return url;
+	return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
-function createQwikRouter(opts) {
-  globalThis.TextEncoderStream ||= _TextEncoderStream_polyfill;
-  if (opts.manifest) {
-    setServerPlatform(opts.manifest);
-  }
-  const staticFolder = opts.static?.root ?? join(Bun.fileURLToPath(import.meta.url), "..", "..", "dist");
-  async function router(request) {
-    try {
-      const url = getRequestUrl(request, opts);
-      const serverRequestEv = {
-        mode: "server",
-        locale: void 0,
-        url,
-        env: {
-          get(key) {
-            return Bun.env[key];
-          }
-        },
-        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;
-        },
-        platform: {
-          ssr: true
-        },
-        getClientConn: () => {
-          return opts.getClientConn ? opts.getClientConn(request) : {};
-        }
-      };
-      const handledResponse = await requestHandler(serverRequestEv, opts);
-      if (handledResponse) {
-        handledResponse.completion.then((completion) => {
-          if (completion) {
-            console.error(completion);
-          }
-        });
-        const response = await handledResponse.response;
-        if (response) {
-          const status = response.status;
-          const location = response.headers.get("Location");
-          const isRedirect = status >= 301 && status <= 308 && location;
-          if (isRedirect) {
-            return new Response(null, 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": "bun-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,
-      content: Bun.file(filePath)
-    };
-  };
-  const staticFile = async (request) => {
-    try {
-      const url = getRequestUrl(request, opts);
-      if (isStaticPath(request.method || "GET", url)) {
-        const { filePath, content } = await openStaticFile(url);
-        if (!await content.exists()) {
-          return new Response("Not Found", {
-            status: 404,
-            headers: {
-              "Content-Type": "text/plain; charset=utf-8",
-              "X-Not-Found": url.pathname
-            }
-          });
-        }
-        const ext = extname(filePath).replace(/^\./, "");
-        return new Response(await content.stream(), {
-          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": "bun-server"
-        }
-      });
-    }
-  };
-  return {
-    router,
-    notFound,
-    staticFile
-  };
+/** @public */ function createQwikRouter(opts) {
+	globalThis.TextEncoderStream ||= _TextEncoderStream_polyfill;
+	if (opts.manifest) setServerPlatform(opts.manifest);
+	const staticFolder = opts.static?.root ?? join(Bun.fileURLToPath(import.meta.url), "..", "..", "dist");
+	async function router(request) {
+		try {
+			const serverRequestEv = {
+				mode: "server",
+				locale: void 0,
+				url: getRequestUrl(request, opts),
+				env: { get(key) {
+					return Bun.env[key];
+				} },
+				request,
+				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) : {};
+				}
+			};
+			const handledResponse = await requestHandler(serverRequestEv, opts);
+			if (handledResponse) {
+				handledResponse.completion.then((completion) => {
+					if (completion) console.error(completion);
+				});
+				const response = await handledResponse.response;
+				if (response) {
+					const status = response.status;
+					const location = response.headers.get("Location");
+					if (status >= 301 && status <= 308 && location) return new Response(null, 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": "bun-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: Bun.file(filePath)
+		};
+	};
+	const staticFile = async (request) => {
+		try {
+			const url = getRequestUrl(request, opts);
+			if (isStaticPath(request.method || "GET", url)) {
+				const { filePath, content } = await openStaticFile(url);
+				if (!await content.exists()) return new Response("Not Found", {
+					status: 404,
+					headers: {
+						"Content-Type": "text/plain; charset=utf-8",
+						"X-Not-Found": url.pathname
+					}
+				});
+				const ext = extname(filePath).replace(/^\./, "");
+				return new Response(await content.stream(), {
+					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": "bun-server"
+				}
+			});
+		}
+	};
+	return {
+		router,
+		notFound,
+		staticFile
+	};
 }
-const createQwikCity = createQwikRouter;
-
+/**
+* @deprecated Use `createQwikRouter` instead. Will be removed in V3
+* @public
+*/ var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };