@qwik.dev/router 2.0.0-beta.27 → 2.0.0-beta.28

package/lib/adapters/shared/vite/index.mjs

@@ -117,7 +117,6 @@ function viteAdapter(opts) {
   let serverOutDir = null;
   let renderModulePath = null;
   let qwikRouterConfigModulePath = null;
-  let isSsrBuild = false;
   let viteCommand;
   const outputEntries = [];
   const plugin = {
@@ -135,36 +134,23 @@ function viteAdapter(opts) {
       return config;
     },
     configResolved(config) {
-      isSsrBuild = !!config.build.ssr;
       viteCommand = config.command;
-      if (isSsrBuild) {
-        qwikRouterPlugin = config.plugins.find(
-          (p) => p.name === "vite-plugin-qwik-router"
-        );
-        if (!qwikRouterPlugin) {
-          throw new Error("Missing vite-plugin-qwik-router");
-        }
-        qwikVitePlugin = config.plugins.find(
-          (p) => p.name === "vite-plugin-qwik"
-        );
-        if (!qwikVitePlugin) {
-          throw new Error("Missing vite-plugin-qwik");
-        }
-        serverOutDir = config.build.outDir;
-        if (config.build?.ssr !== true) {
-          throw new Error(
-            `"build.ssr" must be set to "true" in order to use the "${opts.name}" adapter.`
-          );
-        }
-        if (!config.build?.rollupOptions?.input) {
-          throw new Error(
-            `"build.rollupOptions.input" must be set in order to use the "${opts.name}" adapter.`
-          );
-        }
+      qwikRouterPlugin = config.plugins.find(
+        (p) => p.name === "vite-plugin-qwik-router"
+      );
+      if (!qwikRouterPlugin) {
+        throw new Error("Missing vite-plugin-qwik-router");
+      }
+      qwikVitePlugin = config.plugins.find(
+        (p) => p.name === "vite-plugin-qwik"
+      );
+      if (!qwikVitePlugin) {
+        throw new Error("Missing vite-plugin-qwik");
       }
+      serverOutDir = config.build.outDir;
     },
     buildStart() {
-      if (isSsrBuild && opts.ssg !== null) {
+      if (this.environment.config.consumer === "server" && opts.ssg !== null) {
         const { srcDir } = qwikVitePlugin.api.getOptions();
         if (viteCommand === "build" && serverOutDir && srcDir) {
           this.emitFile({
@@ -181,7 +167,7 @@ function viteAdapter(opts) {
       }
     },
     generateBundle(_, bundles) {
-      if (isSsrBuild) {
+      if (this.environment.config.consumer === "server") {
         outputEntries.length = 0;
         for (const fileName in bundles) {
           const chunk = bundles[fileName];
@@ -199,7 +185,7 @@ function viteAdapter(opts) {
     closeBundle: {
       sequential: true,
       async handler() {
-        if (isSsrBuild && serverOutDir && qwikRouterPlugin?.api && qwikVitePlugin?.api) {
+        if (this.environment.config.consumer === "server" && serverOutDir && qwikRouterPlugin?.api && qwikVitePlugin?.api) {
           const staticPaths = opts.staticPaths || [];
           const routes = qwikRouterPlugin.api.getRoutes();
           const basePathname = qwikRouterPlugin.api.getBasePathname();

package/lib/chunks/index.mjs

@@ -15,7 +15,7 @@ import { WritableStream } from 'node:stream/web';
 async function createNodeMainProcess(sys, opts) {
   const ssgWorkers = [];
   const sitemapBuffer = [];
-  let sitemapPromise = null;
+  let sitemapStream = null;
   opts = { ...opts };
   let outDir = opts.outDir;
   if (typeof outDir !== "string") {
@@ -137,25 +137,35 @@ async function createNodeMainProcess(sys, opts) {
     if (sitemapOutFile && result.ok && result.resourceType === "page") {
       sitemapBuffer.push(`<url><loc>${result.url}</loc></url>`);
       if (sitemapBuffer.length > 50) {
-        if (sitemapPromise) {
-          await sitemapPromise;
-        }
         const siteMapUrls = sitemapBuffer.join("\n") + "\n";
         sitemapBuffer.length = 0;
-        sitemapPromise = fs.promises.appendFile(sitemapOutFile, siteMapUrls);
+        if (sitemapStream) {
+          sitemapStream.write(siteMapUrls);
+        }
       }
     }
     return result;
   };
   const close = async () => {
     const promises = [];
-    if (sitemapOutFile) {
-      if (sitemapPromise) {
-        await sitemapPromise;
-      }
+    if (sitemapStream) {
       sitemapBuffer.push(`</urlset>`);
-      promises.push(fs.promises.appendFile(sitemapOutFile, sitemapBuffer.join("\n")));
+      sitemapStream.write(sitemapBuffer.join("\n"));
       sitemapBuffer.length = 0;
+      await new Promise((resolve2, reject) => {
+        if (sitemapStream) {
+          sitemapStream.end((err) => {
+            if (err) {
+              reject(err);
+            } else {
+              resolve2();
+            }
+          });
+        } else {
+          resolve2();
+        }
+      });
+      sitemapStream = null;
     }
     for (const ssgWorker of ssgWorkers) {
       try {
@@ -172,8 +182,10 @@ async function createNodeMainProcess(sys, opts) {
   };
   if (sitemapOutFile) {
     await ensureDir(sitemapOutFile);
-    await fs.promises.writeFile(
-      sitemapOutFile,
+    sitemapStream = fs.createWriteStream(sitemapOutFile, {
+      flags: "w"
+    });
+    sitemapStream.write(
       `<?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 `
@@ -246,7 +258,7 @@ async function createSystem(opts, threadId) {
   const basePathname = opts.basePathname || "/";
   const basenameLen = basePathname.length;
   const getRouteFilePath = (pathname, isHtml) => {
-    pathname = pathname.slice(basenameLen);
+    pathname = decodeURIComponent(pathname.slice(basenameLen));
     if (isHtml) {
       if (!pathname.endsWith(".html")) {
         if (pathname.endsWith("/")) {
@@ -263,7 +275,7 @@ async function createSystem(opts, threadId) {
     return join(outDir, pathname);
   };
   const getDataFilePath = (pathname) => {
-    pathname = pathname.slice(basenameLen);
+    pathname = decodeURIComponent(pathname.slice(basenameLen));
     if (pathname.endsWith("/")) {
       pathname += "q-data.json";
     } else {

package/lib/middleware/bun/index.mjs

@@ -2,6 +2,7 @@ import { setServerPlatform } from '@qwik.dev/core/server';
 import { _TextEncoderStream_polyfill, isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
 import { join, extname } from 'node:path';
 import { M as MIME_TYPES } from '../../chunks/mime-types.mjs';
+import { isDev } from '@qwik.dev/core/build';
 
 function getRequestUrl(request, opts) {
   const url = new URL(request.url);
@@ -71,7 +72,7 @@ function createQwikRouter(opts) {
       return null;
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "bun-server" }
       });
@@ -87,7 +88,7 @@ function createQwikRouter(opts) {
       });
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "bun-server" }
       });
@@ -132,7 +133,7 @@ function createQwikRouter(opts) {
       return null;
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "bun-server" }
       });

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

@@ -1,5 +1,6 @@
 import { setServerPlatform } from '@qwik.dev/core/server';
 import { _TextEncoderStream_polyfill, isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from '@qwik.dev/router/middleware/request-handler';
+import { isDev } from '@qwik.dev/core/build';
 
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
@@ -82,7 +83,7 @@ function createQwikRouter(opts) {
       });
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "cloudflare-pages" }
       });

package/lib/middleware/deno/index.mjs

@@ -2,6 +2,7 @@ import { setServerPlatform } from '@qwik.dev/core/server';
 import { isStaticPath, getNotFound, mergeHeadersCookies, requestHandler } from '@qwik.dev/router/middleware/request-handler';
 import { M as MIME_TYPES } from '../../chunks/mime-types.mjs';
 import { join, fromFileUrl, extname } from 'https://deno.land/std/path/mod.ts';
+import { isDev } from '@qwik.dev/core/build';
 
 function getRequestUrl(request, opts, info) {
   const url = new URL(request.url);
@@ -63,7 +64,7 @@ function createQwikRouter(opts) {
       return null;
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
       });
@@ -79,7 +80,7 @@ function createQwikRouter(opts) {
       });
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
       });
@@ -119,7 +120,7 @@ function createQwikRouter(opts) {
       return null;
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "deno-server" }
       });

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

@@ -1,5 +1,6 @@
 import { setServerPlatform } from '@qwik.dev/core/server';
 import { isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from '@qwik.dev/router/middleware/request-handler';
+import { isDev } from '@qwik.dev/core/build';
 
 function createQwikRouter(opts) {
   if (opts.qwikCityPlan && !opts.qwikRouterConfig) {
@@ -57,7 +58,7 @@ function createQwikRouter(opts) {
       });
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "netlify-edge" }
       });

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

@@ -1,5 +1,6 @@
 import { setServerPlatform } from '@qwik.dev/core/server';
 import { isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } 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";
@@ -84,7 +85,7 @@ function createQwikRouter(opts) {
       });
     } catch (e) {
       console.error(e);
-      return new Response(String(e || "Error"), {
+      return new Response(isDev ? String(e || "Error") : "Internal Server Error", {
         status: 500,
         headers: { "Content-Type": "text/plain; charset=utf-8", "X-Error": "vercel-edge" }
       });

package/lib/vite/index.mjs

@@ -1545,21 +1545,19 @@ class HtmlTransformPatcher {
   }
   async processHead() {
     try {
-      const fakeHtml = "<html><head>[FAKE_HEAD]</head><body>[FAKE_BODY]</body></html>";
+      const fakeHtml = `<html><head>[FAKE_HEAD]</head><body>[FAKE_BODY]</body></html>`;
       const transformedHtml = await this.server.transformIndexHtml(
         this.request.url || "/",
         fakeHtml
       );
+      const hmrBridge = this.server.hot ? `<script type="module" src="/@id/@qwik-hmr-bridge"><\/script>` : "";
       const fakeHeadIndex = transformedHtml.indexOf("[FAKE_HEAD]");
       const fakeHeadCloseIndex = transformedHtml.indexOf("</head>", fakeHeadIndex);
       if (fakeHeadIndex === -1 || fakeHeadCloseIndex === -1) {
         throw new Error("Transformed HTML does not contain [FAKE_HEAD]...</head>");
       }
       const headPreContent = transformedHtml.slice("<html><head>".length, fakeHeadIndex).trim();
-      const headPostContent = transformedHtml.slice(
-        fakeHeadIndex + "[FAKE_HEAD]".length,
-        fakeHeadCloseIndex
-      );
+      const headPostContent = transformedHtml.slice(fakeHeadIndex + "[FAKE_HEAD]".length, fakeHeadCloseIndex) + hmrBridge;
       const fakeBodyStartIndex = transformedHtml.indexOf("<body>", fakeHeadCloseIndex);
       const fakeBodyIndex = transformedHtml.indexOf("[FAKE_BODY]", fakeBodyStartIndex);
       const fakeBodyEndIndex = transformedHtml.indexOf("</body>", fakeBodyIndex);
@@ -1698,31 +1696,30 @@ const CSS_EXTENSIONS = [".css", ".scss", ".sass", ".less", ".styl", ".stylus"];
 const JS_EXTENSIONS = /\.[mc]?[tj]sx?$/;
 const isCssPath = (url) => CSS_EXTENSIONS.some((ext) => url.endsWith(ext));
 const getCssUrls = (server) => {
+  const graph = server.environments.client.moduleGraph;
   const cssModules = /* @__PURE__ */ new Set();
   const cssImportedByCSS = /* @__PURE__ */ new Set();
-  Array.from(server.moduleGraph.fileToModulesMap.entries()).forEach(([_name, modules]) => {
-    modules.forEach((mod) => {
-      const [pathId, query] = mod.url.split("?");
-      if (!query && isCssPath(pathId)) {
-        const isEntryCSS = mod.importers.size === 0;
-        const hasCSSImporter = Array.from(mod.importers).some((importer) => {
-          const importerPath = importer.url || importer.file;
-          const isCSS = importerPath && isCssPath(importerPath);
-          if (isCSS && mod.url) {
-            cssImportedByCSS.add(mod.url);
-          }
-          return isCSS;
-        });
-        const hasJSImporter = Array.from(mod.importers).some((importer) => {
-          const importerPath = importer.url || importer.file;
-          return importerPath && JS_EXTENSIONS.test(importerPath);
-        });
-        if ((isEntryCSS || hasJSImporter) && !hasCSSImporter && !cssImportedByCSS.has(mod.url)) {
-          cssModules.add(mod);
+  for (const mod of graph.idToModuleMap.values()) {
+    const [pathId, query] = mod.url.split("?");
+    if (!query && isCssPath(pathId)) {
+      const isEntryCSS = mod.importers.size === 0;
+      const hasCSSImporter = Array.from(mod.importers).some((importer) => {
+        const importerPath = importer.url || importer.file;
+        const isCSS = importerPath && isCssPath(importerPath);
+        if (isCSS && mod.url) {
+          cssImportedByCSS.add(mod.url);
         }
+        return isCSS;
+      });
+      const hasJSImporter = Array.from(mod.importers).some((importer) => {
+        const importerPath = importer.url || importer.file;
+        return importerPath && JS_EXTENSIONS.test(importerPath);
+      });
+      if ((isEntryCSS || hasJSImporter) && !hasCSSImporter && !cssImportedByCSS.has(mod.url)) {
+        cssModules.add(mod);
       }
-    });
-  });
+    }
+  }
   return [...cssModules].map(
     ({ url, lastHMRTimestamp }) => `${url}${lastHMRTimestamp ? `?t=${lastHMRTimestamp}` : ""}`
   );
@@ -1804,6 +1801,7 @@ function qwikRouterPlugin(userOpts) {
             QWIK_ROUTER_SW_REGISTER
           ]
         },
+        // Duplicated from configEnvironment to support legacy vite build --ssr compatibility
         ssr: {
           external: ["node:async_hooks"],
           noExternal: [
@@ -1824,6 +1822,23 @@ function qwikRouterPlugin(userOpts) {
       };
       return updatedViteConfig;
     },
+    configEnvironment(name, _config, _env) {
+      if (name === "ssr") {
+        return {
+          resolve: {
+            external: ["node:async_hooks"],
+            noExternal: [
+              QWIK_ROUTER,
+              QWIK_ROUTER_CONFIG_ID,
+              QWIK_ROUTER_ENTRIES_ID,
+              QWIK_ROUTER_SW_REGISTER,
+              "zod"
+            ]
+          }
+        };
+      }
+      return {};
+    },
     async configResolved(config) {
       Object.assign(process.env, loadEnv(config.mode, process.cwd(), ""));
       rootDir = resolve(config.root);
@@ -1918,7 +1933,11 @@ function qwikRouterPlugin(userOpts) {
             });
           }
           if (isRouterConfig) {
-            return generateQwikRouterConfig(ctx, qwikPlugin, opts?.ssr ?? false);
+            return generateQwikRouterConfig(
+              ctx,
+              qwikPlugin,
+              this.environment.config.consumer === "server"
+            );
           }
           if (isSwRegister) {
             return generateServiceWorkerRegister(ctx, swRegister);
@@ -1969,7 +1988,7 @@ function qwikRouterPlugin(userOpts) {
       return null;
     },
     generateBundle(_, bundles) {
-      if (ctx?.target === "client") {
+      if (this.environment.config.consumer === "client") {
         const entries = [...ctx.entries, ...ctx.serviceWorkers].map((entry) => {
           return {
             chunkFileName: entry.chunkFileName,
@@ -1993,7 +2012,7 @@ function qwikRouterPlugin(userOpts) {
     closeBundle: {
       sequential: true,
       async handler() {
-        if (ctx?.target === "ssr" && outDir) {
+        if (this.environment.config.consumer === "server" && outDir) {
           await generateServerPackageJson(outDir);
         }
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.27",
+  "version": "2.0.0-beta.28",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@azure/functions": "3.5.1",
@@ -21,18 +21,18 @@
     "remark-gfm": "^4.0.1",
     "set-cookie-parser": "^2.7.2",
     "source-map": "^0.7.6",
-    "svgo": "^3.3.2",
+    "svgo": "^3.3.3",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
     "valibot": ">=0.36.0 <2",
     "vfile": "6.0.3",
-    "vite": ">=5 <8",
-    "vite-imagetools": "9.0.0",
+    "vite": ">=6 <9",
+    "vite-imagetools": "10.0.0",
     "yaml": "^2.8.2",
     "zod": "^3.25.48"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "7.55.2",
+    "@microsoft/api-extractor": "7.57.6",
     "@types/mdast": "4.0.4",
     "@types/node": "24.10.0",
     "@types/refractor": "4.0.0",
@@ -40,7 +40,7 @@
     "tsm": "2.3.0",
     "typescript": "5.9.3",
     "uvu": "0.5.6",
-    "@qwik.dev/core": "2.0.0-beta.27"
+    "@qwik.dev/core": "2.0.0-beta.28"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -168,8 +168,8 @@
   "license": "MIT",
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
-    "vite": ">=5 <8",
-    "@qwik.dev/core": "^2.0.0-beta.27"
+    "vite": ">=6 <9",
+    "@qwik.dev/core": "^2.0.0-beta.28"
   },
   "publishConfig": {
     "access": "public"