@qwik.dev/router 2.0.0-beta.13 → 2.0.0-beta.15

package/lib/adapters/azure-swa/vite/index.mjs

@@ -1,7 +1,8 @@
-import fs from "node:fs";
-import { join } from "node:path";
-import { viteAdapter } from "../../shared/vite/index.mjs";
-import "../../../chunks/error-handler.mjs";
+import fs from 'node:fs';
+import { join } from 'node:path';
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import '../../../chunks/error-handler.mjs';
+
 function azureSwaAdapter(opts = {}) {
   const env = process?.env;
   return viteAdapter({
@@ -56,6 +57,5 @@ function azureSwaAdapter(opts = {}) {
     }
   });
 }
-export {
-  azureSwaAdapter
-};
+
+export { azureSwaAdapter };

package/lib/adapters/bun-server/vite/index.mjs

@@ -1,7 +1,8 @@
-import { viteAdapter } from "../../shared/vite/index.mjs";
-import "node:path";
-import "node:fs";
-import "../../../chunks/error-handler.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.mjs';
+
 function bunServerAdapter(opts = {}) {
   const env = process?.env;
   return viteAdapter({
@@ -22,6 +23,5 @@ function bunServerAdapter(opts = {}) {
     }
   });
 }
-export {
-  bunServerAdapter
-};
+
+export { bunServerAdapter };

package/lib/adapters/cloud-run/vite/index.mjs

@@ -1,7 +1,8 @@
-import { viteAdapter } from "../../shared/vite/index.mjs";
-import "node:path";
-import "node:fs";
-import "../../../chunks/error-handler.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.mjs';
+
 function cloudRunAdapter(opts = {}) {
   const env = process?.env;
   return viteAdapter({
@@ -19,6 +20,5 @@ function cloudRunAdapter(opts = {}) {
     }
   });
 }
-export {
-  cloudRunAdapter
-};
+
+export { cloudRunAdapter };

package/lib/adapters/cloudflare-pages/vite/index.mjs

@@ -1,8 +1,9 @@
-import fs from "node:fs";
-import { join, relative } from "node:path";
-import { n as normalizePathSlash } from "../../../chunks/fs.mjs";
-import { viteAdapter } from "../../shared/vite/index.mjs";
-import "../../../chunks/error-handler.mjs";
+import fs from 'node:fs';
+import { join, relative } from 'node:path';
+import { n as normalizePathSlash } from '../../../chunks/fs.mjs';
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import '../../../chunks/error-handler.mjs';
+
 function cloudflarePagesAdapter(opts = {}) {
   const env = process?.env;
   return viteAdapter({
@@ -60,6 +61,5 @@ function cloudflarePagesAdapter(opts = {}) {
     }
   });
 }
-export {
-  cloudflarePagesAdapter
-};
+
+export { cloudflarePagesAdapter };

package/lib/adapters/deno-server/vite/index.mjs

@@ -1,7 +1,8 @@
-import { viteAdapter } from "../../shared/vite/index.mjs";
-import "node:path";
-import "node:fs";
-import "../../../chunks/error-handler.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.mjs';
+
 function denoServerAdapter(opts = {}) {
   const env = process?.env;
   return viteAdapter({
@@ -34,6 +35,5 @@ function denoServerAdapter(opts = {}) {
     }
   });
 }
-export {
-  denoServerAdapter
-};
+
+export { denoServerAdapter };

package/lib/adapters/netlify-edge/vite/index.mjs

@@ -1,7 +1,8 @@
-import fs, { existsSync } from "node:fs";
-import { join } from "node:path";
-import { viteAdapter, getParentDir } from "../../shared/vite/index.mjs";
-import "../../../chunks/error-handler.mjs";
+import fs, { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { viteAdapter, getParentDir } from '../../shared/vite/index.mjs';
+import '../../../chunks/error-handler.mjs';
+
 function netlifyEdgeAdapter(opts = {}) {
   const env = process?.env;
   return viteAdapter({
@@ -83,6 +84,5 @@ function netlifyEdgeAdapter(opts = {}) {
     }
   });
 }
-export {
-  netlifyEdgeAdapter
-};
+
+export { netlifyEdgeAdapter };

package/lib/adapters/node-server/vite/index.mjs

@@ -1,7 +1,8 @@
-import { viteAdapter } from "../../shared/vite/index.mjs";
-import "node:path";
-import "node:fs";
-import "../../../chunks/error-handler.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.mjs';
+
 function nodeServerAdapter(opts = {}) {
   const env = process?.env;
   return viteAdapter({
@@ -22,6 +23,5 @@ function nodeServerAdapter(opts = {}) {
     }
   });
 }
-export {
-  nodeServerAdapter
-};
+
+export { nodeServerAdapter };

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

@@ -1,6 +1,7 @@
-import { join, resolve, dirname, basename } from "node:path";
-import fs from "node:fs";
-import { g as getErrorHtml } from "../../../chunks/error-handler.mjs";
+import { join, resolve, dirname, basename } from 'node:path';
+import fs from 'node:fs';
+import { g as getErrorHtml } from '../../../chunks/error-handler.mjs';
+
 async function postBuild(clientOutDir, serverOutDir, pathName, userStaticPaths, cleanStatic) {
   if (pathName && !pathName.endsWith("/")) {
     pathName += "/";
@@ -109,6 +110,7 @@ const injectStatics = async (staticPathsCode, notFoundPathsCode, outDir) => {
   await walk(outDir);
   await Promise.all(promises);
 };
+
 function viteAdapter(opts) {
   let qwikRouterPlugin = null;
   let qwikVitePlugin = null;
@@ -224,7 +226,7 @@ function viteAdapter(opts) {
               );
               ssgOrigin = `https://yoursite.qwik.dev`;
             }
-            const staticGenerate = await import("../../../ssg/index.mjs");
+            const staticGenerate = await import('../../../ssg/index.mjs');
             const generateOpts = {
               maxWorkers: opts.maxWorkers,
               basePathname,
@@ -300,7 +302,5 @@ function getParentDir(startDir, dirName) {
   }
   throw new Error(`Unable to find "${dirName}" directory from "${startDir}"`);
 }
-export {
-  getParentDir,
-  viteAdapter
-};
+
+export { getParentDir, viteAdapter };

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

@@ -1,7 +1,8 @@
-import { viteAdapter } from "../../shared/vite/index.mjs";
-import "node:path";
-import "node:fs";
-import "../../../chunks/error-handler.mjs";
+import { viteAdapter } from '../../shared/vite/index.mjs';
+import 'node:path';
+import 'node:fs';
+import '../../../chunks/error-handler.mjs';
+
 function ssgAdapter(opts) {
   return viteAdapter({
     name: "static-site-generation",
@@ -13,7 +14,5 @@ function ssgAdapter(opts) {
   });
 }
 const staticAdapter = ssgAdapter;
-export {
-  ssgAdapter,
-  staticAdapter
-};
+
+export { ssgAdapter, staticAdapter };

package/lib/adapters/vercel-edge/vite/index.mjs

@@ -1,7 +1,8 @@
-import fs from "node:fs";
-import { join, dirname } from "node:path";
-import { viteAdapter, getParentDir } from "../../shared/vite/index.mjs";
-import "../../../chunks/error-handler.mjs";
+import fs from 'node:fs';
+import { join, dirname } from 'node:path';
+import { viteAdapter, getParentDir } from '../../shared/vite/index.mjs';
+import '../../../chunks/error-handler.mjs';
+
 function vercelEdgeAdapter(opts = {}) {
   return viteAdapter({
     name: "vercel-edge",
@@ -76,6 +77,5 @@ function vercelEdgeAdapter(opts = {}) {
     }
   });
 }
-export {
-  vercelEdgeAdapter
-};
+
+export { vercelEdgeAdapter };

package/lib/chunks/error-handler.mjs

@@ -53,7 +53,5 @@ const escapeHtml = (s) => {
 };
 const COLOR_400 = "#006ce9";
 const COLOR_500 = "#713fc2";
-export {
-  getErrorHtml as g,
-  minimalHtmlResponse as m
-};
+
+export { getErrorHtml as g, minimalHtmlResponse as m };

package/lib/chunks/format-error.mjs

@@ -1,5 +1,6 @@
-import { l as normalizePath } from "./fs.mjs";
-import fs from "node:fs";
+import { l as normalizePath } from './fs.mjs';
+import fs from 'node:fs';
+
 const findLocation = (e) => {
   const stack = e.stack;
   if (typeof stack === "string") {
@@ -108,6 +109,7 @@ function parseId(originalId) {
     params: new URLSearchParams(queryStr)
   };
 }
+
 function formatError(e) {
   if (e instanceof Error) {
     const err = e;
@@ -131,7 +133,5 @@ function formatError(e) {
   }
   return e;
 }
-export {
-  formatError as f,
-  parseId as p
-};
+
+export { formatError as f, parseId as p };

package/lib/chunks/fs.mjs

@@ -1,4 +1,5 @@
-import { normalize, basename, dirname, relative } from "node:path";
+import { normalize, basename, dirname, relative } from 'node:path';
+
 function toTitleCase(str) {
   return str.replace(/\w\S*/g, (txt) => {
     return txt.charAt(0).toUpperCase() + txt.slice(1).toLowerCase();
@@ -28,6 +29,7 @@ function msToString(ms) {
   }
   return (ms / 6e4).toFixed(1) + " m";
 }
+
 function normalizePathname(pathname, basePathname) {
   if (typeof pathname === "string") {
     pathname = pathname.trim();
@@ -101,6 +103,7 @@ const PROTOCOLS = {
   javascript: true,
   file: true
 };
+
 function parseRouteIndexName(extlessName) {
   let layoutName = "";
   const layoutStop = extlessName.endsWith("!");
@@ -247,29 +250,5 @@ function isGroupedLayoutName(dirName, warn = true) {
   }
   return dirName.startsWith("(") && dirName.endsWith(")");
 }
-export {
-  isErrorName as a,
-  isLayoutModule as b,
-  isEntryName as c,
-  isMenuFileName as d,
-  isServiceWorkerName as e,
-  isPageModuleExt as f,
-  getExtension as g,
-  isModuleExt as h,
-  isIndexModule as i,
-  isMarkdownExt as j,
-  isSameOriginUrl as k,
-  normalizePath as l,
-  getPathnameFromDirPath as m,
-  normalizePathSlash as n,
-  getMenuPathname as o,
-  createFileId as p,
-  parseRouteIndexName as q,
-  removeExtension as r,
-  isPluginModule as s,
-  addError as t,
-  addWarning as u,
-  isPageExt as v,
-  msToString as w,
-  getPathnameForDynamicRoute as x
-};
+
+export { isErrorName as a, isLayoutModule as b, isEntryName as c, isMenuFileName as d, isServiceWorkerName as e, isPageModuleExt as f, getExtension as g, isModuleExt as h, isIndexModule as i, isMarkdownExt as j, isSameOriginUrl as k, normalizePath as l, getPathnameFromDirPath as m, normalizePathSlash as n, getMenuPathname as o, createFileId as p, parseRouteIndexName as q, removeExtension as r, isPluginModule as s, addError as t, addWarning as u, isPageExt as v, msToString as w, getPathnameForDynamicRoute as x };

package/lib/chunks/index.mjs

@@ -1,16 +1,17 @@
-import fs from "node:fs";
-import { isAbsolute, resolve, extname, join, dirname, relative } from "node:path";
-import { cpus } from "node:os";
-import { Worker, parentPort, isMainThread, workerData, threadId } from "node:worker_threads";
-import { l as normalizePath, w as msToString, x as getPathnameForDynamicRoute } from "./fs.mjs";
-import { bold, green, dim, red, magenta } from "kleur/colors";
-import { pathToFileURL } from "node:url";
-import { buildErrorMessage } from "vite";
-import { f as formatError } from "./format-error.mjs";
-import { getErrorHtml, RequestEvShareQData, requestHandler, RedirectMessage } from "@qwik.dev/router/middleware/request-handler";
-import { R as RouteDataProp } from "./types.qwik.mjs";
-import { _serialize } from "@qwik.dev/core/internal";
-import { WritableStream } from "node:stream/web";
+import fs from 'node:fs';
+import { isAbsolute, resolve, extname, join, dirname, relative } from 'node:path';
+import { cpus } from 'node:os';
+import { Worker, parentPort, isMainThread, workerData, threadId } from 'node:worker_threads';
+import { l as normalizePath, w as msToString, x as getPathnameForDynamicRoute } from './fs.mjs';
+import { bold, green, dim, red, magenta } from 'kleur/colors';
+import { pathToFileURL } from 'node:url';
+import { buildErrorMessage } from 'vite';
+import { f as formatError } from './format-error.mjs';
+import { getErrorHtml, RequestEvShareQData, requestHandler, RedirectMessage } from '@qwik.dev/router/middleware/request-handler';
+import { R as RouteDataProp } from './types.qwik.mjs';
+import { _serialize } from '@qwik.dev/core/internal';
+import { WritableStream } from 'node:stream/web';
+
 async function createNodeMainProcess(sys, opts) {
   const ssgWorkers = [];
   const sitemapBuffer = [];
@@ -200,6 +201,7 @@ function ssgWorkerCompare(a, b) {
   }
   return a.totalTasks < b.totalTasks ? -1 : 1;
 }
+
 async function createNodeWorkerProcess(onMessage) {
   parentPort?.on("message", async (msg) => {
     parentPort?.postMessage(await onMessage(msg));
@@ -208,7 +210,8 @@ async function createNodeWorkerProcess(onMessage) {
     }
   });
 }
-async function createSystem(opts, threadId2) {
+
+async function createSystem(opts, threadId) {
   const createWriteStream = (filePath) => {
     return fs.createWriteStream(filePath, {
       flags: "w"
@@ -224,12 +227,12 @@ async function createSystem(opts, threadId2) {
     };
   };
   const createLogger = async () => {
-    if (threadId2 !== void 0) {
+    if (threadId !== void 0) {
       return {
-        debug: opts.log === "debug" ? console.debug.bind(console, `[${threadId2}]`) : () => {
+        debug: opts.log === "debug" ? console.debug.bind(console, `[${threadId}]`) : () => {
         },
-        error: console.error.bind(console, `[${threadId2}]`),
-        info: console.info.bind(console, `[${threadId2}]`)
+        error: console.error.bind(console, `[${threadId}]`),
+        info: console.info.bind(console, `[${threadId}]`)
       };
     }
     return {
@@ -299,6 +302,7 @@ const access = async (path) => {
     return false;
   }
 };
+
 function extractParamNames(routeName) {
   const params = [];
   let idx = 0;
@@ -315,6 +319,7 @@ function extractParamNames(routeName) {
   }
   return params;
 }
+
 async function generateNotFoundPages(sys, opts, routes) {
   if (opts.emit404Pages !== false) {
     const basePathname = opts.basePathname || "/";
@@ -326,14 +331,15 @@ async function generateNotFoundPages(sys, opts, routes) {
       const filePath = sys.getRouteFilePath(rootNotFoundPathname, true);
       const html = getErrorHtml(404, "Resource Not Found");
       await sys.ensureDir(filePath);
-      return new Promise((resolve2) => {
+      return new Promise((resolve) => {
         const writer = sys.createWriteStream(filePath);
         writer.write(html);
-        writer.end(resolve2);
+        writer.end(resolve);
       });
     }
   }
 }
+
 function createRouteTester(basePathname, includeRoutes, excludeRoutes) {
   const includes = routesToRegExps(includeRoutes);
   const excludes = routesToRegExps(excludeRoutes);
@@ -379,6 +385,7 @@ function routeToRegExp(rule) {
   transformedRule = `^${transformedRule.replace(/\*/g, ".*")}$`;
   return new RegExp(transformedRule);
 }
+
 async function mainThread(sys) {
   const opts = sys.getOptions();
   validateOptions(opts);
@@ -391,7 +398,7 @@ async function mainThread(sys) {
   const routes = qwikRouterConfig.routes || [];
   const trailingSlash = !!qwikRouterConfig.trailingSlash;
   const includeRoute = createRouteTester(opts.basePathname || "/", opts.include, opts.exclude);
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve, reject) => {
     try {
       const timer = sys.createTimer();
       const generatorResult = {
@@ -426,7 +433,7 @@ ${green("SSG results")}`);
           log.info(``);
         }
         closePromise.then(() => {
-          setTimeout(() => resolve2(generatorResult));
+          setTimeout(() => resolve(generatorResult));
         }).catch(reject);
       };
       const next = () => {
@@ -591,6 +598,7 @@ function validateOptions(opts) {
     throw new Error(`Invalid "origin"`, { cause: e });
   }
 }
+
 async function workerThread(sys) {
   delete globalThis.__qwik;
   const ssgOpts = sys.getOptions();
@@ -607,8 +615,8 @@ async function workerThread(sys) {
     switch (msg.type) {
       case "render": {
         log.debug(`Worker thread rendering: ${msg.pathname}`);
-        return new Promise((resolve2) => {
-          workerRender(sys, opts, msg, pendingPromises, resolve2).catch((e) => {
+        return new Promise((resolve) => {
+          workerRender(sys, opts, msg, pendingPromises, resolve).catch((e) => {
             console.error("Error during render", msg.pathname, e);
           });
         });
@@ -735,18 +743,18 @@ async function workerRender(sys, opts, staticRoute, pendingPromises, callback) {
                   const serialized = await _serialize([qData]);
                   dataWriter.write(serialized);
                   writePromises.push(
-                    new Promise((resolve2) => {
+                    new Promise((resolve) => {
                       result.filePath = routeFilePath;
-                      dataWriter.end(resolve2);
+                      dataWriter.end(resolve);
                     })
                   );
                 }
               }
               if (routeWriter) {
                 writePromises.push(
-                  new Promise((resolve2) => {
+                  new Promise((resolve) => {
                     result.filePath = routeFilePath;
-                    routeWriter.end(resolve2);
+                    routeWriter.end(resolve);
                   }).finally(closeResolved)
                 );
               }
@@ -847,6 +855,7 @@ const noopWritableStream = {
     return noopWriter;
   }
 };
+
 async function generate(opts) {
   if (isMainThread) {
     const sys = await createSystem(opts);
@@ -871,6 +880,5 @@ if (!isMainThread && workerData) {
     console.error(e);
   });
 }
-export {
-  generate
-};
+
+export { generate };

package/lib/chunks/mime-types.mjs

@@ -48,6 +48,5 @@ const MIME_TYPES = {
   xml: "text/xml",
   zip: "application/zip"
 };
-export {
-  MIME_TYPES as M
-};
+
+export { MIME_TYPES as M };