@qwik.dev/router 2.0.0-beta.35 → 2.0.0-beta.37

package/lib/ssg/index.d.ts

@@ -79,13 +79,13 @@ export declare interface SsgRenderOptions extends RenderOptions {
     log?: 'debug' | 'quiet';
     /**
      * Set to `false` if the generated static HTML files should not be written to disk. Setting to
-     * `false` is useful if the SSG should only write the `q-data.json` files to disk. Defaults to
+     * `false` is useful if the SSG should only write the per-loader data files to disk. Defaults to
      * `true`.
      */
     emitHtml?: boolean;
     /**
-     * Set to `false` if the generated `q-data.json` data files should not be written to disk.
-     * Defaults to `true`.
+     * Set to `false` if the generated per-loader data files should not be written to disk. Defaults
+     * to `true`.
      */
     emitData?: boolean;
     /**

package/lib/ssg/index.mjs

@@ -1,6 +1,7 @@
 import { bold, green, dim, red, magenta } from 'kleur/colors';
 import { relative } from 'node:path';
-import { m as msToString, g as getPathnameForDynamicRoute } from '../chunks/pathname.mjs';
+import { m as msToString } from '../chunks/format.mjs';
+import { e as ensureSlash, g as getPathnameForDynamicRoute } from '../chunks/pathname.mjs';
 
 function routeToRegExp(rule) {
   let transformedRule;
@@ -190,7 +191,7 @@ ${bold(red(`!!! ${result.pathname}: Error during SSG`))}`);
                 const segments = pathname.split("/");
                 const lastSegment = segments[segments.length - 1];
                 if (!lastSegment.includes(".")) {
-                  pathname += "/";
+                  pathname = ensureSlash(pathname);
                 }
               }
             } else {
@@ -220,7 +221,7 @@ ${bold(red(`!!! ${result.pathname}: Error during SSG`))}`);
             index
           ];
           const joinedParts = pathParts.join("/");
-          const originalPathname = basePathname + (joinedParts ? joinedParts + "/" : "");
+          const originalPathname = basePathname + (joinedParts ? ensureSlash(joinedParts) : "");
           const paramNames = pathParts.filter((p) => p.startsWith("[") && p.endsWith("]")).map((p) => p.startsWith("[...") ? p.slice(4, -1) : p.slice(1, -1));
           if (paramNames.length === 0) {
             addToQueue(originalPathname, void 0);

package/lib/vite/index.d.ts

@@ -111,6 +111,21 @@ declare interface PluginOptions {
     rewriteRoutes?: RewriteRouteOption[];
     /** The serialization strategy for route loaders. Defaults to `never`. */
     defaultLoadersSerializationStrategy?: SerializationStrategy;
+    /**
+     * Enable strict mode for route loaders and actions by default.
+     *
+     * When true:
+     *
+     * - Loaders without an explicit `search` option act as if `search: []` — they only re-fetch when
+     *   the route path changes and ignore all URL search params.
+     * - Actions without an explicit `invalidate` option act as if `invalidate: []` — they don't re-run
+     *   any loaders after completion.
+     *
+     * Individual loaders/actions can override this by specifying `search` or `invalidate` explicitly.
+     *
+     * Defaults to `true`.
+     */
+    strictLoaders?: boolean;
 }
 
 /**

package/lib/vite/index.mjs

@@ -2,7 +2,8 @@ import { mergeConfig, normalizePath as normalizePath$1, loadEnv } from 'vite';
 import fs, { existsSync } from 'node:fs';
 import path, { join, dirname, basename, resolve, isAbsolute, extname } from 'node:path';
 import { g as getExtension, r as removeExtension, i as isIndexModule, a as isErrorName, b as isLayoutModule, c as isEntryName, d as isMenuFileName, e as isServiceWorkerName, f as isPageModuleExt, h as isModuleExt, j as isMarkdownExt, k as normalizePath, l as getPathnameFromDirPath, m as getMenuPathname, o as createFileId, p as parseRouteIndexName, q as isPluginModule, s as isPageExt } from '../chunks/fs.mjs';
-import { i as isSameOriginUrl, a as addError, b as addWarning } from '../chunks/pathname.mjs';
+import { a as addError, b as addWarning } from '../chunks/format.mjs';
+import { i as isSameOriginUrl, e as ensureSlash } from '../chunks/pathname.mjs';
 import { marked } from 'marked';
 import { createHash } from 'node:crypto';
 import { SourceMapGenerator } from 'source-map';
@@ -96,7 +97,7 @@ The link "${url}", found within "${containingFilePath}" does not have a matching
         url = url.slice(0, -1);
       }
     } else if (!globalThis.__NO_TRAILING_SLASH__) {
-      url += "/";
+      url = ensureSlash(url);
     }
   }
   return url;
@@ -569,7 +570,7 @@ function deriveFromTrie(opts, root) {
 function translateRoute(route, config, configIndex) {
   const replacePath = (part) => (config.paths || {})[part] ?? part;
   const pathnamePrefix = config.prefix ? "/" + config.prefix : "";
-  const routeNamePrefix = config.prefix ? config.prefix + "/" : "";
+  const routeNamePrefix = config.prefix ? ensureSlash(config.prefix) : "";
   const idSuffix = config.prefix?.toUpperCase().replace(/-/g, "");
   const patternInfix = config.prefix ? [
     config.prefix
@@ -788,7 +789,7 @@ function normalizeOptions(rootDir, viteBasePath, userOpts) {
   if (!(viteBasePath.startsWith("/") && viteBasePath.endsWith("/"))) {
     console.error(`warning: vite's config.base must begin and end with /. This will be an error in v2. If you have a valid use case, please open an issue.`);
     if (!viteBasePath.endsWith("/")) {
-      viteBasePath += "/";
+      viteBasePath = ensureSlash(viteBasePath);
     }
   }
   const opts = {
@@ -814,12 +815,15 @@ function normalizeOptions(rootDir, viteBasePath, userOpts) {
   }
   if (!opts.basePathname.endsWith("/")) {
     console.error(`Warning: qwik-router plugin basePathname must end with /. This will be an error in v2`);
-    opts.basePathname += "/";
+    opts.basePathname = ensureSlash(opts.basePathname);
   }
   const url = new URL(opts.basePathname, "https://qwik.dev/");
   opts.basePathname = url.pathname;
   opts.mdx = opts.mdx || {};
   opts.platform = opts.platform || {};
+  if (opts.strictLoaders === void 0) {
+    opts.strictLoaders = true;
+  }
   return opts;
 }
 function createBuildContext(rootDir, viteBasePath, userOpts, target, dynamicImports) {
@@ -1314,7 +1318,7 @@ function getClientRouteBundleNames(qwikPlugin, r) {
   }
   return bundlesNames;
 }
-function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, ancestorLayouts, isSSR, indent) {
+function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, ancestorLayouts, isSSR, indent, loadersByFile) {
   const lines = [];
   const nextIndent = indent + "  ";
   if (node._P) {
@@ -1413,6 +1417,31 @@ function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menu
       }
     }
   }
+  {
+    const routeFiles = node._files.filter((f) => f.type === "route" || f.type === "layout").map((f) => f.filePath);
+    if (node === ctx.routeTrie) {
+      for (const plugin of ctx.serverPlugins) {
+        routeFiles.push(plugin.filePath);
+      }
+    }
+    if (routeFiles.length > 0) {
+      if (loadersByFile) {
+        const nodeLoaderHashes = [];
+        for (const filePath of routeFiles) {
+          const hashes = loadersByFile.get(filePath);
+          if (hashes) {
+            nodeLoaderHashes.push(...hashes);
+          }
+        }
+        if (nodeLoaderHashes.length > 0) {
+          lines.push(`${nextIndent}_R: ${JSON.stringify(nodeLoaderHashes)},`);
+        }
+      } else {
+        const placeholder = `__LOADERS:${routeFiles.join("|")}__`;
+        lines.push(`${nextIndent}_R: ${JSON.stringify(placeholder)},`);
+      }
+    }
+  }
   if (errorExpr) {
     lines.push(`${nextIndent}_E: ${errorExpr},`);
   }
@@ -1445,7 +1474,7 @@ function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menu
     groupChildren.sort((a, b) => a[0].localeCompare(b[0]));
     const groupStrs = [];
     for (const [_key, child] of groupChildren) {
-      const childStr = serializeBuildTrie(ctx, qwikPlugin, child, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, childAncestors, isSSR, nextIndent);
+      const childStr = serializeBuildTrie(ctx, qwikPlugin, child, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, childAncestors, isSSR, nextIndent, loadersByFile);
       if (childStr !== "{}") {
         groupStrs.push(childStr);
       }
@@ -1455,7 +1484,7 @@ function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menu
     }
   }
   for (const [key, child] of regularChildren) {
-    const childStr = serializeBuildTrie(ctx, qwikPlugin, child, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, childAncestors, isSSR, nextIndent);
+    const childStr = serializeBuildTrie(ctx, qwikPlugin, child, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, childAncestors, isSSR, nextIndent, loadersByFile);
     if (childStr !== "{}") {
       const keyStr = JSON.stringify(key);
       lines.push(`${nextIndent}${keyStr}: ${childStr},`);
@@ -1468,7 +1497,7 @@ function serializeBuildTrie(ctx, qwikPlugin, node, layoutIdMap, routeIdMap, menu
 ${lines.join("\n")}
 ${indent}}`;
 }
-function createRoutes(ctx, qwikPlugin, c, esmImports, isSSR) {
+function createRoutes(ctx, qwikPlugin, c, esmImports, isSSR, loadersByFile) {
   const includeEndpoints = isSSR;
   const dynamicImports = ctx.dynamicImports;
   const layoutIdMap = /* @__PURE__ */ new Map();
@@ -1542,7 +1571,7 @@ function createRoutes(ctx, qwikPlugin, c, esmImports, isSSR) {
       routeIdMap.set(route.filePath, `()=>${route.id}`);
     }
   }
-  const trieStr = serializeBuildTrie(ctx, qwikPlugin, ctx.routeTrie, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, [], isSSR, "");
+  const trieStr = serializeBuildTrie(ctx, qwikPlugin, ctx.routeTrie, layoutIdMap, routeIdMap, menuIdMap, errorFiles, notFoundFiles, [], isSSR, "", loadersByFile);
   const baseSegments = ctx.opts.basePathname.split("/").filter((s) => s.length > 0);
   let routesExpr = trieStr;
   for (let j = baseSegments.length - 1; j >= 0; j--) {
@@ -1567,7 +1596,7 @@ function createServerPlugins(ctx, _qwikPlugin, c, esmImports, isSSR) {
   c.push(`];`);
 }
 
-function generateQwikRouterConfig(ctx, qwikPlugin, isSSR) {
+function generateQwikRouterConfig(ctx, qwikPlugin, isSSR, loadersByFile) {
   const esmImports = [];
   const c = [];
   c.push(`
@@ -1578,7 +1607,7 @@ import { isDev } from '@qwik.dev/core/build';`);
     esmImports.push(`import 'virtual:qwik-router-server-fns';`);
   }
   createServerPlugins(ctx, qwikPlugin, c, esmImports, isSSR);
-  createRoutes(ctx, qwikPlugin, c, esmImports, isSSR);
+  createRoutes(ctx, qwikPlugin, c, esmImports, isSSR, loadersByFile);
   createEntries(ctx, c);
   c.push(`export const trailingSlash = ${JSON.stringify(!globalThis.__NO_TRAILING_SLASH__)};`);
   c.push(`export const basePathname = ${JSON.stringify(ctx.opts.basePathname)};`);
@@ -2416,6 +2445,74 @@ const QWIK_ROUTER_ENTRIES_ID = "@qwik-router-entries";
 const QWIK_ROUTER = "@qwik.dev/router";
 const QWIK_ROUTER_SW_REGISTER = "@qwik-router-sw-register";
 const VIRTUAL_SERVER_FNS = "virtual:qwik-router-server-fns";
+function replaceLoaderPlaceholders(code, loadersByFile) {
+  return code.replace(/_R\s*:\s*"__LOADERS:([^"]+)__"\s*,?/g, (_match, paths) => {
+    const filePaths = paths.split("|");
+    const hashes = [];
+    for (const filePath of filePaths) {
+      const fileHashes = loadersByFile.get(filePath);
+      if (fileHashes) {
+        hashes.push(...fileHashes);
+      }
+    }
+    if (hashes.length > 0) {
+      return `_R: ${JSON.stringify(hashes)},`;
+    }
+    return "";
+  });
+}
+function addRouteLoaderHash(loadersByFile, filePath, hash) {
+  const normalizedPath = normalizePath(filePath);
+  const existing = loadersByFile.get(normalizedPath);
+  if (!existing) {
+    loadersByFile.set(normalizedPath, [
+      hash
+    ]);
+    return true;
+  }
+  if (!existing.includes(hash)) {
+    existing.push(hash);
+    return true;
+  }
+  return false;
+}
+function clearRouteLoaderHashes(loadersByFile, filePath) {
+  return loadersByFile.delete(normalizePath(filePath));
+}
+function isRouterSourceFilePath(filePath) {
+  const fileName = basename(filePath);
+  const extlessName = removeExtension(fileName);
+  return isMenuFileName(fileName) || isIndexModule(extlessName) || isErrorName(extlessName) || isLayoutModule(extlessName) || isEntryName(extlessName) || isServiceWorkerName(extlessName) || isPluginModule(extlessName);
+}
+function isPathInDir(filePath, dirPath) {
+  return filePath === dirPath || filePath.startsWith(`${dirPath}/`);
+}
+function isRouterSourceFileForContext(filePath, ctx) {
+  const normalizedPath = normalizePath(filePath);
+  return isRouterSourceFilePath(normalizedPath) && (isPathInDir(normalizedPath, ctx.opts.routesDir) || isPathInDir(normalizedPath, ctx.opts.serverPluginsDir));
+}
+function invalidateRouterConfigModules(server) {
+  const modules = [];
+  const moduleGraphs = /* @__PURE__ */ new Set();
+  moduleGraphs.add(server.moduleGraph);
+  const environments = server.environments;
+  if (environments) {
+    for (const environment of Object.values(environments)) {
+      const graph = environment?.moduleGraph;
+      if (graph) {
+        moduleGraphs.add(graph);
+      }
+    }
+  }
+  for (const graph of moduleGraphs) {
+    const mod = graph.getModuleById(QWIK_ROUTER_CONFIG_ID);
+    if (mod) {
+      graph.invalidateModule(mod);
+      modules.push(mod);
+    }
+  }
+  return modules;
+}
 async function generateServerPackageJson(outDir) {
   await fs.promises.mkdir(outDir, {
     recursive: true
@@ -2447,6 +2544,7 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
   let devSsrServer = userOpts?.devSsrServer;
   const routesDir = userOpts?.routesDir ?? "src/routes";
   const serverPluginsDir = userOpts?.serverPluginsDir ?? routesDir;
+  const loadersByFile = /* @__PURE__ */ new Map();
   const api = {
     getBasePathname: () => ctx?.opts.basePathname ?? "/",
     getRoutes: () => {
@@ -2466,7 +2564,8 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
         define: {
           "globalThis.__DEFAULT_LOADERS_SERIALIZATION_STRATEGY__": JSON.stringify(userOpts?.defaultLoadersSerializationStrategy || "never"),
           "globalThis.__NO_TRAILING_SLASH__": JSON.stringify(userOpts?.trailingSlash === false),
-          "globalThis.__SSR_CACHE_SIZE__": JSON.stringify(viteEnv.command === "serve" ? 0 : userOpts?.ssrCacheSize ?? 50)
+          "globalThis.__SSR_CACHE_SIZE__": JSON.stringify(viteEnv.command === "serve" ? 0 : userOpts?.ssrCacheSize ?? 50),
+          "globalThis.__STRICT_LOADERS__": JSON.stringify(userOpts?.strictLoaders !== false)
         },
         appType: "custom",
         resolve: {
@@ -2566,6 +2665,14 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
       if (!qwikPlugin) {
         throw new Error("Missing vite-plugin-qwik");
       }
+      qwikPlugin.api.onSegment((parentId, segment) => {
+        if (segment.ctxName === "routeLoader$") {
+          const changed = addRouteLoaderHash(loadersByFile, parentId, segment.hash);
+          if (changed && devServer) {
+            invalidateRouterConfigModules(devServer);
+          }
+        }
+      });
       if (typeof devSsrServer !== "boolean") {
         devSsrServer = qwikPlugin.api._oldDevSsrServer();
       }
@@ -2576,21 +2683,19 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
     },
     async configureServer(server) {
       devServer = server;
-      const toWatch = resolve(rootDir, "src/routes/**/{index,layout,entry,service-worker}{.,@,-}*");
+      const toWatch = [
+        join(ctx.opts.routesDir, "**/{index,index!,index@*,layout,layout!,layout-*,error,404,entry,service-worker,menu}.{ts,tsx,js,jsx,md,mdx}"),
+        join(ctx.opts.serverPluginsDir, "plugin{,@*}.{ts,tsx,js,jsx}")
+      ];
       server.watcher.add(toWatch);
       await new Promise((resolve2) => setTimeout(resolve2, 1e3));
       server.watcher.on("change", (path) => {
-        if (!/\/(index[.@]|layout[.-]|entry\.|service-worker\.)[^/]*$/.test(path)) {
+        if (!isRouterSourceFileForContext(path, ctx)) {
           return;
         }
+        clearRouteLoaderHashes(loadersByFile, path);
         ctx.isDirty = true;
-        const graph = server.environments?.ssr?.moduleGraph;
-        if (graph) {
-          const mod = graph.getModuleById("@qwik-router-config");
-          if (mod) {
-            graph.invalidateModule(mod);
-          }
-        }
+        invalidateRouterConfigModules(server);
       });
       if (userOpts?.devSsrServer !== false) {
         return () => {
@@ -2598,6 +2703,18 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
         };
       }
     },
+    handleHotUpdate({ file, modules, server }) {
+      if (!ctx || !isRouterSourceFileForContext(file, ctx)) {
+        return;
+      }
+      clearRouteLoaderHashes(loadersByFile, file);
+      ctx.isDirty = true;
+      const configModules = invalidateRouterConfigModules(server);
+      return [
+        ...modules,
+        ...configModules
+      ];
+    },
     transformIndexHtml() {
       if (viteCommand !== "serve") {
         return;
@@ -2638,7 +2755,7 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
             });
           }
           if (isRouterConfig) {
-            return generateQwikRouterConfig(ctx, qwikPlugin, this.environment.config.consumer === "server");
+            return generateQwikRouterConfig(ctx, qwikPlugin, this.environment.config.consumer === "server", devServer ? loadersByFile : void 0);
           }
           if (isSwRegister) {
             return generateServiceWorkerRegister(ctx, swRegister);
@@ -2692,6 +2809,11 @@ function qwikRouterPlugin(userOpts, buildContextRef) {
       return null;
     },
     generateBundle(_, bundles) {
+      for (const chunk of Object.values(bundles)) {
+        if (chunk.type === "chunk" && chunk.code.includes("__LOADERS:")) {
+          chunk.code = replaceLoaderPlaceholders(chunk.code, loadersByFile);
+        }
+      }
       if (this.environment.config.consumer === "client") {
         const entries = [
           ...ctx.entries,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qwik.dev/router",
   "description": "The router for Qwik.",
-  "version": "2.0.0-beta.35",
+  "version": "2.0.0-beta.37",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
     "@azure/functions": "3.5.1",
@@ -40,7 +40,7 @@
     "tsm": "2.3.0",
     "typescript": "5.9.3",
     "uvu": "0.5.6",
-    "@qwik.dev/core": "2.0.0-beta.35"
+    "@qwik.dev/core": "2.0.0-beta.37"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -169,7 +169,7 @@
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
     "vite": ">=6 <9",
-    "@qwik.dev/core": "^2.0.0-beta.35"
+    "@qwik.dev/core": "^2.0.0-beta.37"
   },
   "publishConfig": {
     "access": "public"

package/lib/chunks/redirect-handler.mjs

@@ -1,6 +0,0 @@
-class AbortMessage {
-}
-class RedirectMessage extends AbortMessage {
-}
-
-export { AbortMessage as A, RedirectMessage as R };