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

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

@@ -1,5 +1,5 @@
 import { setServerPlatform } from '@qwik.dev/core/server';
-import { isStaticPath, mergeHeadersCookies, requestHandler, getNotFound } from '@qwik.dev/router/middleware/request-handler';
+import { isStaticPath, mergeHeadersCookies, requestHandler, getErrorHtml } from '@qwik.dev/router/middleware/request-handler';
 import { isDev } from '@qwik.dev/core/build';
 
 const COUNTRY_HEADER_NAME = "x-vercel-ip-country";
@@ -74,7 +74,7 @@ function createQwikRouter(opts) {
           return response;
         }
       }
-      const notFoundHtml = !request.headers.get("accept")?.includes("text/html") || isStaticPath(request.method || "GET", url) ? "Not Found" : getNotFound(url.pathname);
+      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: {

package/lib/ssg/index.d.ts

@@ -26,14 +26,11 @@ export declare function runSsg(opts: SsgInternalOptions): Promise<never>;
  * @public
  */
 export declare interface SsgInternalOptions extends SsgOptions {
-    /** The SSR render function (default export from entry.ssr). */
+    /** SSR render function (default export from `entry.ssr`); worker-only — the main entry omits it. */
     render: Render;
     /** The Qwik Router Config object (default export from `@qwik-router-config`). */
     qwikRouterConfig: QwikRouterConfig;
-    /**
-     * Path or URL to the worker entry file. Workers are spawned using this file. When run-ssg.js
-     * serves as both main and worker entry, this should be `import.meta.url` of that file.
-     */
+    /** Path or URL to the worker entry file (`run-ssg-worker.js`); workers are spawned from it. */
     workerFilePath?: string | URL;
 }
 
@@ -88,11 +85,6 @@ export declare interface SsgRenderOptions extends RenderOptions {
      * to `true`.
      */
     emitData?: boolean;
-    /**
-     * Set to `false` if the static build should not write custom or default `404.html` pages.
-     * Defaults to `true`.
-     */
-    emit404Pages?: boolean;
     /**
      * Defines file system routes relative to the source `routes` directory that should be static
      * generated. Accepts wildcard behavior. This should not include the "base" pathname. If not

package/lib/ssg/index.mjs

@@ -2,57 +2,9 @@ import { bold, green, dim, red, magenta } from 'kleur/colors';
 import { relative } from 'node:path';
 import { m as msToString } from '../chunks/format.mjs';
 import { e as ensureSlash, g as getPathnameForDynamicRoute } from '../chunks/pathname.mjs';
-
-function routeToRegExp(rule) {
-  let transformedRule;
-  if (rule === "/" || rule === "/*") {
-    transformedRule = rule;
-  } else if (rule.endsWith("/*")) {
-    transformedRule = `${rule.substring(0, rule.length - 2)}(/*)?`;
-  } else if (rule.endsWith("/")) {
-    transformedRule = `${rule.substring(0, rule.length - 1)}(/)?`;
-  } else if (rule.endsWith("*")) {
-    transformedRule = rule;
-  } else {
-    transformedRule = `${rule}(/)?`;
-  }
-  transformedRule = `^${transformedRule.replace(/\*/g, ".*")}$`;
-  return new RegExp(transformedRule);
-}
-function routesToRegExps(routes) {
-  if (!Array.isArray(routes)) {
-    return [];
-  }
-  return routes.filter((r) => typeof r === "string").map(routeToRegExp);
-}
-function createRouteTester(basePathname, includeRoutes, excludeRoutes) {
-  const includes = routesToRegExps(includeRoutes);
-  const excludes = routesToRegExps(excludeRoutes);
-  return (pathname) => {
-    if (pathname.endsWith("404.html")) {
-      return true;
-    }
-    if (basePathname !== "/") {
-      pathname = pathname.slice(basePathname.length - 1);
-    }
-    for (const exclude of excludes) {
-      if (exclude.test(pathname)) {
-        return false;
-      }
-    }
-    for (const include of includes) {
-      if (include.test(pathname)) {
-        return true;
-      }
-    }
-    return false;
-  };
-}
+import { c as createRouteTester } from '../chunks/routes.mjs';
 
 function validateOptions(opts) {
-  if (!opts.render) {
-    throw new Error(`Missing "render" option`);
-  }
   if (!opts.qwikRouterConfig) {
     throw new Error(`Missing "qwikRouterConfig" option`);
   }
@@ -247,6 +199,14 @@ ${bold(red(`!!! ${result.pathname}: Error during SSG`))}`);
             }
           }
         }
+        if (node._4 || node._E) {
+          const isStaticDir = !pathParts.some((p) => p.startsWith("["));
+          if (isStaticDir) {
+            const joinedParts = pathParts.join("/");
+            const dirPathname = basePathname + (joinedParts ? ensureSlash(joinedParts) : "");
+            addToQueue(dirPathname + "404.html", void 0);
+          }
+        }
         if (node._M) {
           for (const group of node._M) {
             await traverseRouteTree(group, pathParts, basePathname, currentLoaders);
@@ -329,7 +289,7 @@ async function startWorker(opts) {
     qwikRouterConfig: opts.qwikRouterConfig
   };
   const { createSystem } = await import('../chunks/system.mjs');
-  const { workerThread } = await import('../chunks/worker-thread.qwik.mjs');
+  const { workerThread } = await import('../chunks/worker-thread.mjs');
   const sys = await createSystem(mergedOpts, workerData?.threadId);
   await workerThread(sys);
 }

package/lib/vite/index.d.ts

@@ -159,6 +159,13 @@ declare interface QwikRouterPluginApi {
     getBasePathname: () => string;
     getRoutes: () => BuiltRoute[];
     getServiceWorkers: () => BuiltEntry[];
+    /**
+     * Hand the adapter's SSG include/exclude patterns to the router so the production server route
+     * plan can drop fully-prerendered, server-free routes. Called by the SSG adapter.
+     *
+     * @internal
+     */
+    _setSsgRoutes?: (include: string[] | undefined, exclude: string[] | undefined) => void;
 }
 
 /** @public */
@@ -192,6 +199,7 @@ export declare interface QwikRouterVitePluginOptions extends Omit<PluginOptions,
 declare interface RewriteRouteOption {
     prefix?: string;
     paths: Record<string, string>;
+    exclude?: string[];
 }
 
 export { }