@qwik.dev/router 2.0.0-beta.43 → 2.0.0-beta.45

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

@@ -1,6 +1,7 @@
 import { t as ensureSlash } from "../../chunks/pathname.mjs";
 import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middleware/node";
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	try {
 		const { router, staticFile } = createQwikRouter$1({
 			render: opts.render,
@@ -25,7 +26,8 @@ import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middlew
 				router(req, res, () => {});
 			});
 		};
-		/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_req, _res, next) => {
+		/** @deprecated `router` handles 404 responses. Will be removed in V3. */
+		const notFound = async (_req, _res, next) => {
 			next();
 		};
 		return {
@@ -42,5 +44,6 @@ import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middlew
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

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

@@ -1,7 +1,8 @@
 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) {
+/** @public */
+function createQwikRouter(opts) {
 	if (opts.manifest) setServerPlatform(opts.manifest);
 	async function onAzureSwaRequest(context, req) {
 		try {
@@ -83,5 +84,6 @@ import { parseString } from "set-cookie-parser";
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/middleware/bun/index.mjs

@@ -1,4 +1,4 @@
-import { n as MIME_TYPES, t as normalizeRequestUrl } from "../../chunks/url.mjs";
+import { n as normalizeRequestUrl, r as MIME_TYPES, t as getStaticFilePath } from "../../chunks/static-file.mjs";
 import { isDev } from "@qwik.dev/core/build";
 import { setServerPlatform } from "@qwik.dev/core/server";
 import { extname, join } from "node:path";
@@ -9,7 +9,8 @@ function getRequestUrl(request, opts) {
 	if (!origin) return url;
 	return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
-/** @public */ function createQwikRouter(opts) {
+/** @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");
@@ -61,16 +62,12 @@ function getRequestUrl(request, opts) {
 			});
 		}
 	}
-	/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_request) => {
+	/** @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");
+	const openStaticFile = async (staticFilePath) => {
+		const filePath = join(staticFolder, staticFilePath);
 		return {
 			filePath,
 			content: Bun.file(filePath)
@@ -80,7 +77,9 @@ function getRequestUrl(request, opts) {
 		try {
 			const url = getRequestUrl(request, opts);
 			if (isStaticPath(request.method || "GET", url)) {
-				const { filePath, content } = await openStaticFile(url);
+				const staticFilePath = getStaticFilePath(url.pathname);
+				if (staticFilePath === void 0) return null;
+				const { filePath, content } = await openStaticFile(staticFilePath);
 				if (!await content.exists()) return new Response("Not Found", {
 					status: 404,
 					headers: {
@@ -118,5 +117,6 @@ function getRequestUrl(request, opts) {
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

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

@@ -1,7 +1,8 @@
 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) {
+/** @public */
+function createQwikRouter(opts) {
 	try {
 		new globalThis.TextEncoderStream();
 	} catch {
@@ -12,7 +13,7 @@ import { _TextEncoderStream_polyfill, getErrorHtml, isStaticPath, mergeHeadersCo
 		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 useCache = url.hostname !== "127.0.0.1" && url.hostname !== "localhost" && url.port === "" && request.method === "GET" && !request.headers.has("Cookie") && !request.headers.has("Authorization");
 			const cacheKey = new Request(url.href, request);
 			const cache = useCache ? await caches.open("custom:qwikrouter") : null;
 			if (cache) {
@@ -58,7 +59,7 @@ import { _TextEncoderStream_polyfill, getErrorHtml, isStaticPath, mergeHeadersCo
 				});
 				const response = await handledResponse.response;
 				if (response) {
-					if (response.ok && cache && response.headers.has("Cache-Control")) ctx.waitUntil(cache.put(cacheKey, response.clone()));
+					if (response.ok && cache && isSharedCacheable(response)) ctx.waitUntil(cache.put(cacheKey, response.clone()));
 					return response;
 				}
 			}
@@ -83,8 +84,22 @@ import { _TextEncoderStream_polyfill, getErrorHtml, isStaticPath, mergeHeadersCo
 	}
 	return onCloudflarePagesFetch;
 }
+var uncacheableDirectives = /* @__PURE__ */ new Set([
+	"private",
+	"no-store",
+	"no-cache"
+]);
+var isSharedCacheable = (response) => {
+	const cacheControl = response.headers.get("Cache-Control");
+	if (!cacheControl || response.headers.has("Set-Cookie")) return false;
+	return !cacheControl.split(",").some((value) => {
+		const directive = value.trim().split("=", 1)[0].toLowerCase();
+		return uncacheableDirectives.has(directive);
+	});
+};
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/middleware/deno/index.mjs

@@ -1,4 +1,4 @@
-import { n as MIME_TYPES, t as normalizeRequestUrl } from "../../chunks/url.mjs";
+import { n as normalizeRequestUrl, r as MIME_TYPES, t as getStaticFilePath } from "../../chunks/static-file.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";
@@ -10,7 +10,8 @@ function getRequestUrl(request, opts, info) {
 	if (!origin) return url;
 	return normalizeRequestUrl(`${url.pathname}${url.search}${url.hash}`, origin);
 }
-/** @public */ function createQwikRouter(opts) {
+/** @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) {
@@ -54,16 +55,12 @@ function getRequestUrl(request, opts, info) {
 			});
 		}
 	}
-	/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_request) => {
+	/** @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");
+	const openStaticFile = async (staticFilePath) => {
+		const filePath = join(staticFolder, staticFilePath);
 		return {
 			filePath,
 			content: await Deno.open(filePath, { read: true })
@@ -73,7 +70,9 @@ function getRequestUrl(request, opts, info) {
 		try {
 			const url = getRequestUrl(request, opts);
 			if (isStaticPath(request.method || "GET", url)) {
-				const { filePath, content } = await openStaticFile(url);
+				const staticFilePath = getStaticFilePath(url.pathname);
+				if (staticFilePath === void 0) return null;
+				const { filePath, content } = await openStaticFile(staticFilePath);
 				const ext = extname(filePath).replace(/^\./, "");
 				return new Response(content.readable, {
 					status: 200,
@@ -104,5 +103,6 @@ function getRequestUrl(request, opts, info) {
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/middleware/firebase/index.mjs

@@ -1,5 +1,6 @@
 import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middleware/node";
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	const { staticFile, router } = createQwikRouter$1({
 		render: opts.render,
 		manifest: opts.manifest,
@@ -19,5 +20,6 @@ import { createQwikRouter as createQwikRouter$1 } from "@qwik.dev/router/middlew
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

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

@@ -1,7 +1,8 @@
 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) {
+/** @public */
+function createQwikRouter(opts) {
 	if (opts.manifest) setServerPlatform(opts.manifest);
 	async function onNetlifyEdgeRequest(request, context) {
 		try {
@@ -61,5 +62,6 @@ import { getErrorHtml, isStaticPath, mergeHeadersCookies, requestHandler } from
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/middleware/node/index.mjs

@@ -1,20 +1,23 @@
-import { n as MIME_TYPES, t as normalizeRequestUrl } from "../../chunks/url.mjs";
+import { n as normalizeRequestUrl, r as MIME_TYPES, t as getStaticFilePath } from "../../chunks/static-file.mjs";
 import { i as validateRequestBodyLimit, n as RequestBodyLimitError, t as DEFAULT_REQUEST_BODY_LIMIT } from "../../chunks/request-body-limit.mjs";
 import { t as devPreloadedRouteLoaders } from "../../chunks/dev-preloaded-route-loader.mjs";
 import { isDev } from "@qwik.dev/core";
 import { setServerPlatform } from "@qwik.dev/core/server";
 import { createReadStream } from "node:fs";
-import { basename, extname, join } from "node:path";
+import { extname, join } from "node:path";
 import { isStaticPath, requestHandler } from "@qwik.dev/router/middleware/request-handler";
 import { fileURLToPath } from "node:url";
 import { Http2ServerRequest } from "node:http2";
+function computeOrigin(req, opts) {
+	return opts?.getOrigin?.(req) ?? opts?.origin ?? process.env.ORIGIN ?? fallbackOrigin(req);
+}
 function fallbackOrigin(req) {
 	const { PROTOCOL_HEADER, HOST_HEADER } = process.env;
 	const headers = req.headers;
 	return `${PROTOCOL_HEADER && headers[PROTOCOL_HEADER] || (req.socket.encrypted || req.connection.encrypted ? "https" : "http")}://${headers[HOST_HEADER ?? (req instanceof Http2ServerRequest ? ":authority" : "host")]}`;
 }
-function computeOrigin(req, opts) {
-	return opts?.getOrigin?.(req) ?? opts?.origin ?? process.env.ORIGIN ?? fallbackOrigin(req);
+function getUrl(req, origin) {
+	return normalizeUrl(req.originalUrl || req.url || "/", origin);
 }
 function isClientAbortWriteError(error) {
 	if (!(error instanceof Error)) return false;
@@ -26,9 +29,6 @@ var invalidHeadersPattern = /^:(method|scheme|authority|path)$/i;
 function normalizeUrl(url, base) {
 	return normalizeRequestUrl(url, base);
 }
-function getUrl(req, origin) {
-	return normalizeUrl(req.originalUrl || req.url || "/", origin);
-}
 function createNodeResponseSink(res) {
 	let closed = res.closed || res.destroyed;
 	let responseError;
@@ -243,7 +243,8 @@ async function fromNodeHttp(url, req, res, mode, getClientConn, requestBodyLimit
 		locale: void 0
 	};
 }
-/** @public */ function createQwikRouter(opts) {
+/** @public */
+function createQwikRouter(opts) {
 	if (opts.manifest) setServerPlatform(opts.manifest);
 	const staticFolder = opts.static?.root ?? join(fileURLToPath(import.meta.url), "..", "..", "dist");
 	const router = async (req, res, next, limits = {}) => {
@@ -275,16 +276,15 @@ async function fromNodeHttp(url, req, res, mode, getClientConn, requestBodyLimit
 			next(e);
 		}
 	};
-	/** @deprecated `router` handles 404 responses. Will be removed in V3. */ const notFound = async (_req, _res, next) => next();
+	/** @deprecated `router` handles 404 responses. Will be removed in V3. */
+	const notFound = async (_req, _res, next) => next();
 	const staticFile = async (req, res, next) => {
 		try {
 			const url = getUrl(req, computeOrigin(req, opts));
 			if (isStaticPath(req.method || "GET", url)) {
-				const pathname = url.pathname;
-				let filePath;
-				if (basename(pathname).includes(".")) filePath = join(staticFolder, pathname);
-				else if (!globalThis.__NO_TRAILING_SLASH__) filePath = join(staticFolder, pathname + "index.html");
-				else filePath = join(staticFolder, pathname, "index.html");
+				const staticFilePath = getStaticFilePath(url.pathname);
+				if (staticFilePath === void 0) return next();
+				const filePath = join(staticFolder, staticFilePath);
 				const ext = extname(filePath).replace(/^\./, "");
 				const stream = createReadStream(filePath);
 				stream.on("error", next);
@@ -309,5 +309,6 @@ async function fromNodeHttp(url, req, res, mode, getClientConn, requestBodyLimit
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

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

@@ -1,4 +1,4 @@
-import { Y as _asyncRequestStore, d as loadRoute } from "../../chunks/head.qwik.mjs";
+import { Q 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";
@@ -6,34 +6,24 @@ import { a as getStaticPathRedirect, c as clearSsrCache, d as mergeHeadersCookie
 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");
+	if (isDev) {
+		const config = await import("@qwik-router-config");
+		await config.importEagerModules?.();
+		return config;
+	}
+	if (!qwikRouterConfig) {
+		const config = await import("@qwik-router-config");
+		await config.importEagerModules?.();
+		qwikRouterConfig = 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("X-Qwik-fullpath") ?? (isDevRequest ? serverRequestEv.request.headers.get("X-Qwik-route-path") : null);
-	return resolveValidInternalFullPathname(loaderPathname, routePath) ?? loaderPathname;
-}
-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))
-	};
-}
 /**
 * The request handler for QwikRouter. Called by every adapter.
 *
 * @public
-*/ async function requestHandler(serverRequestEv, opts) {
+*/
+async function requestHandler(serverRequestEv, opts) {
 	const { render, checkOrigin } = opts;
 	const config = await getConfig();
 	const pathname = getRequestHandlerPathname(serverRequestEv);
@@ -54,11 +44,32 @@ async function loadRequestHandlers(qwikRouterConfig, pathname, method, checkOrig
 	if (config.fallthrough && loadedRoute.$notFound$) return null;
 	return runQwikRouter(serverRequestEv, loadedRoute, requestHandlers, rebuildRouteInfo, config.basePathname);
 }
+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("X-Qwik-fullpath") ?? (isDevRequest ? serverRequestEv.request.headers.get("X-Qwik-route-path") : null);
+	return resolveValidInternalFullPathname(loaderPathname, routePath) ?? loaderPathname;
+}
+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))
+	};
+}
 /**
 * 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 {
+*/
+/** @internal */
+var _TextEncoderStream_polyfill = class {
 	#pendingHighSurrogate = null;
 	#handle = new TextEncoder();
 	#transform = new TransformStream({

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

@@ -7,7 +7,8 @@ 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) {
+/** @public */
+function createQwikRouter(opts) {
 	if (opts.manifest) setServerPlatform(opts.manifest);
 	async function onVercelEdgeRequest(request) {
 		try {
@@ -80,5 +81,6 @@ var BASE_URL = "BASE_URL";
 /**
 * @deprecated Use `createQwikRouter` instead. Will be removed in V3
 * @public
-*/ var createQwikCity = createQwikRouter;
+*/
+var createQwikCity = createQwikRouter;
 export { createQwikCity, createQwikRouter };

package/lib/service-worker/index.mjs

@@ -9,5 +9,6 @@
 *   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 = () => {};
+*/
+var setupServiceWorker = () => {};
 export { setupServiceWorker };

package/lib/ssg/index.mjs

@@ -3,18 +3,6 @@ import { r as msToString } from "../chunks/format.mjs";
 import { t as createRouteTester } from "../chunks/routes.mjs";
 import { relative } from "node:path";
 import { bold, dim, green, magenta, red } from "kleur/colors";
-function validateOptions(opts) {
-	if (!opts.qwikRouterConfig) throw new Error(`Missing "qwikRouterConfig" option`);
-	let siteOrigin = opts.origin;
-	if (typeof siteOrigin !== "string" || siteOrigin.trim().length === 0) throw new Error(`Missing "origin" option`);
-	siteOrigin = siteOrigin.trim();
-	if (!/:\/\//.test(siteOrigin) || siteOrigin.startsWith("://")) throw new Error(`"origin" must start with a valid protocol, such as "https://" or "http://", received "${siteOrigin}"`);
-	try {
-		new URL(siteOrigin);
-	} catch (e) {
-		throw new Error(`Invalid "origin"`, { cause: e });
-	}
-}
 async function mainThread(sys) {
 	const opts = sys.getOptions();
 	validateOptions(opts);
@@ -136,7 +124,8 @@ async function mainThread(sys) {
 			* Traverse the route tree and call the callback for each route that has module loaders.
 			* Reconstructs the original pathname and param names from the tree path. Accumulates _L
 			* layout loaders from ancestors during traversal.
-			*/ const traverseRouteTree = async (node, pathParts, basePathname, ancestorLoaders) => {
+			*/
+			const traverseRouteTree = async (node, pathParts, basePathname, ancestorLoaders) => {
 				const currentLoaders = node._L ? [...ancestorLoaders, node._L] : ancestorLoaders;
 				const index = node._I;
 				if (index) {
@@ -203,12 +192,25 @@ async function mainThread(sys) {
 		}
 	});
 }
+function validateOptions(opts) {
+	if (!opts.qwikRouterConfig) throw new Error(`Missing "qwikRouterConfig" option`);
+	let siteOrigin = opts.origin;
+	if (typeof siteOrigin !== "string" || siteOrigin.trim().length === 0) throw new Error(`Missing "origin" option`);
+	siteOrigin = siteOrigin.trim();
+	if (!/:\/\//.test(siteOrigin) || siteOrigin.startsWith("://")) throw new Error(`"origin" must start with a valid protocol, such as "https://" or "http://", received "${siteOrigin}"`);
+	try {
+		new URL(siteOrigin);
+	} catch (e) {
+		throw new Error(`Invalid "origin"`, { cause: e });
+	}
+}
 /**
 * Use this function when SSG should be generated from another module, such as a Vite plugin. This
 * function's should be passed the paths of the entry module and Qwik Router Plan.
 *
 * @public
-*/ async function generate(opts) {
+*/
+async function generate(opts) {
 	const { createSystem } = await import("../chunks/system.mjs");
 	return mainThread(await createSystem(opts));
 }
@@ -219,7 +221,8 @@ async function mainThread(sys) {
 * Intended to be called from a generated `run-ssg.js` wrapper that provides render/config.
 *
 * @public
-*/ async function runSsg(opts) {
+*/
+async function runSsg(opts) {
 	try {
 		const result = await generate(opts);
 		const fs = await import("node:fs");
@@ -243,7 +246,8 @@ async function mainThread(sys) {
 * @param opts - Must include `render` and `qwikRouterConfig` (imported by the worker entry). The
 *   remaining serializable options come from `workerData`.
 * @public
-*/ async function startWorker(opts) {
+*/
+async function startWorker(opts) {
 	const { workerData } = await import("node:worker_threads");
 	const mergedOpts = {
 		...workerData,

package/lib/vite/index.d.ts

@@ -1,4 +1,4 @@
-import type { BuiltinsWithOptionalParams } from 'svgo/plugins/plugins-types';
+import type { BuiltinsWithOptionalParams } from 'svgo';
 import type { CompileOptions } from '@mdx-js/mdx';
 import type { Config } from 'svgo';
 import { ConfigEnv } from 'vite';