@marko/run 0.9.6 → 0.10.0

package/dist/adapter/index.cjs

@@ -65,6 +65,7 @@ var import_kleur = __toESM(require("kleur"), 1);
 var import_supports_color = __toESM(require("supports-color"), 1);
 function stripAnsi(string) {
   return string.replace(
+    /* cspell:disable-next-line */
     /([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g,
     ""
   );
@@ -88,7 +89,7 @@ function logInfoBox(address, explorer) {
   const color = !!import_supports_color.default.stdout;
   let message = import_kleur.default.bold("Marko Run");
   if (true) {
-    message += ` v${"0.9.6"}`;
+    message += ` v${"0.10.0"}`;
   }
   message += "\n\n";
   message += import_kleur.default.dim("Server listening at");
@@ -274,7 +275,7 @@ var httpVerbOrder = httpVerbs.reduce(
 var import_path3 = __toESM(require("path"), 1);
 var markoFiles = `(${RoutableFileTypes.Layout}|${RoutableFileTypes.Page}|${RoutableFileTypes.NotFound}|${RoutableFileTypes.Error})\\.(?:.*\\.)?(marko)`;
 var nonMarkoFiles = `(${RoutableFileTypes.Middleware}|${RoutableFileTypes.Handler}|${RoutableFileTypes.Meta})\\.(?:.*\\.)?(.+)`;
-var routeableFileRegex = new RegExp(
+var RoutableFileRegex = new RegExp(
   `[+](?:${markoFiles}|${nonMarkoFiles})$`,
   "i"
 );
@@ -344,11 +345,11 @@ async function resolveAdapter(root, options, log) {
   }
   const pkg = await getPackageData(root);
   if (pkg) {
-    let dependecies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
+    let dependencies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
     if (pkg.devDependencies) {
-      dependecies = dependecies.concat(Object.keys(pkg.devDependencies));
+      dependencies = dependencies.concat(Object.keys(pkg.devDependencies));
     }
-    for (const name of dependecies) {
+    for (const name of dependencies) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module3 = await import(
@@ -356,7 +357,7 @@ async function resolveAdapter(root, options, log) {
             name
           );
           log && debug(
-            `Using adapter ${name} listed in your package.json dependecies`
+            `Using adapter ${name} listed in your package.json dependencies`
           );
           return module3.default();
         } catch (err) {
@@ -501,7 +502,7 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `Timeout while wating for server to start on port "${port}".`
+        `Timeout while waiting for server to start on port "${port}".`
       );
     }
   }
@@ -802,12 +803,12 @@ function copyResponseHeaders(response, headers) {
     response.appendHeader("set-cookie", setCookies);
   }
 }
-function createMiddleware(fetch, options) {
+function createMiddleware(fetch, options = {}) {
   const {
     origin = process.env.ORIGIN,
     trustProxy = process.env.TRUST_PROXY === "1",
     createPlatform = (platform) => platform
-  } = options ?? (options = {});
+  } = options;
   return async (req, res, next) => {
     var _a, _b, _c;
     try {
@@ -1063,8 +1064,8 @@ function adapter() {
             port,
             envFile
           );
-          nextWorker.on("message", (messsage) => {
-            if (messsage === "restart") {
+          nextWorker.on("message", (message) => {
+            if (message === "restart") {
               start();
             }
           }).send({ type: "start", entry, config: config2 });

package/dist/adapter/index.js

@@ -1,6 +1,6 @@
 // src/adapter/index.ts
 import fs5 from "fs";
-import inspector from "inspector";
+import inspector2 from "inspector";
 import path8 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -20,9 +20,10 @@ import {
 
 // src/adapter/utils.ts
 import kleur from "kleur";
-import supporsColor from "supports-color";
+import supportsColor from "supports-color";
 function stripAnsi(string) {
   return string.replace(
+    /* cspell:disable-next-line */
     /([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g,
     ""
   );
@@ -43,10 +44,10 @@ function prepareError(err) {
   };
 }
 function logInfoBox(address, explorer) {
-  const color = !!supporsColor.stdout;
+  const color = !!supportsColor.stdout;
   let message = kleur.bold("Marko Run");
   if (true) {
-    message += ` v${"0.9.6"}`;
+    message += ` v${"0.10.0"}`;
   }
   message += "\n\n";
   message += kleur.dim("Server listening at");
@@ -232,7 +233,7 @@ var httpVerbOrder = httpVerbs.reduce(
 import path3 from "path";
 var markoFiles = `(${RoutableFileTypes.Layout}|${RoutableFileTypes.Page}|${RoutableFileTypes.NotFound}|${RoutableFileTypes.Error})\\.(?:.*\\.)?(marko)`;
 var nonMarkoFiles = `(${RoutableFileTypes.Middleware}|${RoutableFileTypes.Handler}|${RoutableFileTypes.Meta})\\.(?:.*\\.)?(.+)`;
-var routeableFileRegex = new RegExp(
+var RoutableFileRegex = new RegExp(
   `[+](?:${markoFiles}|${nonMarkoFiles})$`,
   "i"
 );
@@ -302,11 +303,11 @@ async function resolveAdapter(root, options, log) {
   }
   const pkg = await getPackageData(root);
   if (pkg) {
-    let dependecies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
+    let dependencies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
     if (pkg.devDependencies) {
-      dependecies = dependecies.concat(Object.keys(pkg.devDependencies));
+      dependencies = dependencies.concat(Object.keys(pkg.devDependencies));
     }
-    for (const name of dependecies) {
+    for (const name of dependencies) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module2 = await import(
@@ -314,7 +315,7 @@ async function resolveAdapter(root, options, log) {
             name
           );
           log && debug(
-            `Using adapter ${name} listed in your package.json dependecies`
+            `Using adapter ${name} listed in your package.json dependencies`
           );
           return module2.default();
         } catch (err) {
@@ -459,7 +460,7 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `Timeout while wating for server to start on port "${port}".`
+        `Timeout while waiting for server to start on port "${port}".`
       );
     }
   }
@@ -532,9 +533,9 @@ import {
 // src/adapter/logger.ts
 import DraftLog from "draftlog";
 import format2 from "human-format";
-import inpspector from "inspector";
+import inspector from "inspector";
 import kleur3 from "kleur";
-if (!inpspector.url()) {
+if (!inspector.url()) {
   DraftLog.into(console);
   DraftLog.defaults.canReWrite = false;
 }
@@ -763,12 +764,12 @@ function copyResponseHeaders(response, headers) {
     response.appendHeader("set-cookie", setCookies);
   }
 }
-function createMiddleware(fetch, options) {
+function createMiddleware(fetch, options = {}) {
   const {
     origin = process.env.ORIGIN,
     trustProxy = process.env.TRUST_PROXY === "1",
     createPlatform = (platform) => platform
-  } = options ?? (options = {});
+  } = options;
   return async (req, res, next) => {
     var _a, _b, _c;
     try {
@@ -1024,8 +1025,8 @@ function adapter() {
             port,
             envFile
           );
-          nextWorker.on("message", (messsage) => {
-            if (messsage === "restart") {
+          nextWorker.on("message", (message) => {
+            if (message === "restart") {
               start();
             }
           }).send({ type: "start", entry, config: config2 });
@@ -1055,7 +1056,7 @@ function adapter() {
       envFile && await loadEnv(envFile);
       const inspect = getInspectOptions(options.args);
       if (inspect) {
-        inspector.open(inspect.port, inspect.host, inspect.wait);
+        inspector2.open(inspect.port, inspect.host, inspect.wait);
       }
       const listenerPromise = new Promise((resolve) => {
         const listener2 = devServer.middlewares.listen(port, () => {

package/dist/adapter/middleware.cjs

@@ -70,12 +70,12 @@ function copyResponseHeaders(response, headers) {
     response.appendHeader("set-cookie", setCookies);
   }
 }
-function createMiddleware(fetch, options) {
+function createMiddleware(fetch, options = {}) {
   const {
     origin = process.env.ORIGIN,
     trustProxy = process.env.TRUST_PROXY === "1",
     createPlatform = (platform) => platform
-  } = options ?? (options = {});
+  } = options;
   return async (req, res, next) => {
     var _a, _b, _c;
     try {

package/dist/adapter/middleware.js

@@ -38,12 +38,12 @@ function copyResponseHeaders(response, headers) {
     response.appendHeader("set-cookie", setCookies);
   }
 }
-function createMiddleware(fetch, options) {
+function createMiddleware(fetch, options = {}) {
   const {
     origin = process.env.ORIGIN,
     trustProxy = process.env.TRUST_PROXY === "1",
     createPlatform = (platform) => platform
-  } = options ?? (options = {});
+  } = options;
   return async (req, res, next) => {
     var _a, _b, _c;
     try {

package/dist/adapter/utils.d.ts

@@ -1,6 +1,6 @@
-import type { Rollup } from "vite";
-type RollupError = Rollup.RollupError;
-export declare function prepareError(err: Error | RollupError): {
+import type { Rolldown } from "vite";
+type RolldownError = Rolldown.RolldownError;
+export declare function prepareError(err: Error | RolldownError): {
     message: string;
     stack: string;
     id: string | undefined;
@@ -9,7 +9,7 @@ export declare function prepareError(err: Error | RollupError): {
     pluginCode: string | undefined;
     loc: {
         column: number;
-        file?: string | undefined;
+        file?: string;
         line: number;
     } | undefined;
 };

package/dist/cli/index.mjs

@@ -21,7 +21,7 @@ import { build as viteBuild, resolveConfig } from "vite";
 
 // src/adapter/index.ts
 import fs5 from "fs";
-import inspector from "inspector";
+import inspector2 from "inspector";
 import path8 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -41,9 +41,10 @@ import {
 
 // src/adapter/utils.ts
 import kleur from "kleur";
-import supporsColor from "supports-color";
+import supportsColor from "supports-color";
 function stripAnsi(string) {
   return string.replace(
+    /* cspell:disable-next-line */
     /([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g,
     ""
   );
@@ -438,7 +439,6 @@ function writeRouteEntryHandler(writer, route, verb) {
       continuations.writeLines(
         `const ${currentName} = () => context.render(page, {});`
       );
-      nextName = currentName;
     } else {
       writer.writeLines(`return context.render(page, {});`);
       hasBody = true;
@@ -1352,12 +1352,12 @@ var VDir = _VDir;
 // src/vite/routes/builder.ts
 var markoFiles = `(${RoutableFileTypes.Layout}|${RoutableFileTypes.Page}|${RoutableFileTypes.NotFound}|${RoutableFileTypes.Error})\\.(?:.*\\.)?(marko)`;
 var nonMarkoFiles = `(${RoutableFileTypes.Middleware}|${RoutableFileTypes.Handler}|${RoutableFileTypes.Meta})\\.(?:.*\\.)?(.+)`;
-var routeableFileRegex = new RegExp(
+var RoutableFileRegex = new RegExp(
   `[+](?:${markoFiles}|${nonMarkoFiles})$`,
   "i"
 );
 function matchRoutableFile(filename) {
-  const match = filename.match(routeableFileRegex);
+  const match = filename.match(RoutableFileRegex);
   return match && (match[1] || match[3]).toLowerCase();
 }
 async function buildRoutes(sources, outDir) {
@@ -1399,7 +1399,7 @@ async function buildRoutes(sources, outDir) {
     },
     onFile(file) {
       const { name } = file;
-      const match = name.match(routeableFileRegex);
+      const match = name.match(RoutableFileRegex);
       if (!match) {
         return;
       }
@@ -1819,6 +1819,7 @@ var ReadOncePersistedStore = class {
   constructor(uid) {
     this.uid = uid;
   }
+  uid;
   write(value) {
     values.set(this.uid, value);
   }
@@ -2120,7 +2121,7 @@ function markoRun(opts = {}) {
         }
       },
       async config(config2, env) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
         const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = mergeConfig(opts, externalPluginOptions);
@@ -2167,51 +2168,54 @@ function markoRun(opts = {}) {
         devEntryFilePosix = normalizePath(devEntryFile);
         let outDir = ((_e = config2.build) == null ? void 0 : _e.outDir) || "dist";
         const assetsDir = ((_f = config2.build) == null ? void 0 : _f.assetsDir) || "assets";
-        let rollupOutputOptions = (_h = (_g = config2.build) == null ? void 0 : _g.rollupOptions) == null ? void 0 : _h.output;
+        let rolldownOutputOptions = (_h = (_g = config2.build) == null ? void 0 : _g.rolldownOptions) == null ? void 0 : _h.output;
         if (isBuild) {
           if (!isSSRBuild) {
             outDir = path6.join(outDir, CLIENT_OUT_DIR);
           }
-          rollupOutputOptions = mergeOutputOptions(
+          rolldownOutputOptions = mergeOutputOptions(
             {
-              assetFileNames: `${assetsDir}/[name]-[hash].[ext]`,
+              assetFileNames(info) {
+                var _a2;
+                const name = ((_a2 = info.names) == null ? void 0 : _a2[0]) && cleanFileName(info.names[0]);
+                return name ? `${assetsDir}/${name}-[hash].[ext]` : `${assetsDir}/_[hash].[ext]`;
+              },
               entryFileNames(info) {
-                return `${assetsDir}/${getEntryFileName(info.name) || "[name]"}-[hash].js`;
+                const raw = getEntryFileName(info.name) || info.name;
+                const name = raw && cleanFileName(raw);
+                return name ? `${assetsDir}/${name}-[hash].js` : `${assetsDir}/_[hash].js`;
               },
               chunkFileNames: isSSRBuild ? `_[hash].js` : `${assetsDir}/_[hash].js`
             },
-            rollupOutputOptions
+            rolldownOutputOptions
           );
         }
-        const browserslistTarget = isBuild && !((_i = config2.build) == null ? void 0 : _i.target) ? browserslist(void 0, {
-          path: root
-        }) : void 0;
-        shouldEmptyOutDir = ((_j = config2.build) == null ? void 0 : _j.emptyOutDir) ?? true;
-        const pluginConfig = await ((_k = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _k.call(adapter, config2)) || {};
+        shouldEmptyOutDir = ((_i = config2.build) == null ? void 0 : _i.emptyOutDir) ?? true;
+        const pluginConfig = await ((_j = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _j.call(adapter, config2)) || {};
         pluginConfig.ssr ?? (pluginConfig.ssr = {});
-        (_l = pluginConfig.ssr).noExternal ?? (_l.noExternal = /@marko\/run($|\/)/);
+        (_k = pluginConfig.ssr).noExternal ?? (_k.noExternal = /@marko\/run($|\/)/);
         pluginConfig.css ?? (pluginConfig.css = {});
-        (_m = pluginConfig.css).devSourcemap ?? (_m.devSourcemap = true);
+        (_l = pluginConfig.css).devSourcemap ?? (_l.devSourcemap = true);
         pluginConfig.build ?? (pluginConfig.build = {});
-        (_n = pluginConfig.build).outDir ?? (_n.outDir = outDir);
-        (_o = pluginConfig.build).assetsDir ?? (_o.assetsDir = assetsDir);
-        (_p = pluginConfig.build).copyPublicDir ?? (_p.copyPublicDir = !isSSRBuild);
-        (_q = pluginConfig.build).ssrEmitAssets ?? (_q.ssrEmitAssets = false);
-        (_r = pluginConfig.build).emptyOutDir ?? (_r.emptyOutDir = false);
-        (_s = pluginConfig.build).rollupOptions ?? (_s.rollupOptions = {});
-        if (rollupOutputOptions) {
-          pluginConfig.build.rollupOptions.output = mergeOutputOptions(
-            rollupOutputOptions,
-            pluginConfig.build.rollupOptions.output
+        (_m = pluginConfig.build).outDir ?? (_m.outDir = outDir);
+        (_n = pluginConfig.build).assetsDir ?? (_n.assetsDir = assetsDir);
+        (_o = pluginConfig.build).copyPublicDir ?? (_o.copyPublicDir = !isSSRBuild);
+        (_p = pluginConfig.build).ssrEmitAssets ?? (_p.ssrEmitAssets = false);
+        (_q = pluginConfig.build).emptyOutDir ?? (_q.emptyOutDir = false);
+        (_r = pluginConfig.build).rolldownOptions ?? (_r.rolldownOptions = {});
+        if (rolldownOutputOptions) {
+          pluginConfig.build.rolldownOptions.output = mergeOutputOptions(
+            rolldownOutputOptions,
+            pluginConfig.build.rolldownOptions.output
           );
         }
-        (_u = pluginConfig.build).sourcemap ?? (_u.sourcemap = ((_t = config2.build) == null ? void 0 : _t.sourcemap) ?? (isBuild && !isSSRBuild));
-        (_v = pluginConfig.build).modulePreload ?? (_v.modulePreload = {});
+        (_t = pluginConfig.build).sourcemap ?? (_t.sourcemap = ((_s = config2.build) == null ? void 0 : _s.sourcemap) ?? (isBuild && !isSSRBuild));
+        (_u = pluginConfig.build).modulePreload ?? (_u.modulePreload = {});
         if (typeof pluginConfig.build.modulePreload !== "boolean") {
           pluginConfig.build.modulePreload.polyfill = false;
         }
         pluginConfig.optimizeDeps ?? (pluginConfig.optimizeDeps = {});
-        if (!((_w = config2.optimizeDeps) == null ? void 0 : _w.entries)) {
+        if (!((_v = config2.optimizeDeps) == null ? void 0 : _v.entries)) {
           pluginConfig.optimizeDeps.entries = [
             `${normalizePath(path6.relative(root, routesDir))}/**/*+{page,layout}.marko`,
             "!**/__snapshots__/**",
@@ -2219,21 +2223,16 @@ function markoRun(opts = {}) {
             "!**/coverage/**"
           ];
         }
-        if (browserslistTarget == null ? void 0 : browserslistTarget.length) {
-          (_x = pluginConfig.build).target ?? (_x.target = resolveToEsbuildTarget(
-            browserslistTarget,
-            {
-              printUnknownTargets: false
-            }
-          ));
+        if (isBuild && !((_w = config2.build) == null ? void 0 : _w.target)) {
+          pluginConfig.build.target = getBrowserslistTargets(root);
         }
         if (isBuild) {
           pluginConfig.logLevel ?? (pluginConfig.logLevel = "warn");
           pluginConfig.define ?? (pluginConfig.define = {});
-          (_y = pluginConfig.define)["process.env.NODE_ENV"] ?? (_y["process.env.NODE_ENV"] = "'production'");
+          (_x = pluginConfig.define)["process.env.NODE_ENV"] ?? (_x["process.env.NODE_ENV"] = "'production'");
           pluginConfig.resolve ?? (pluginConfig.resolve = {});
-          (_z = pluginConfig.resolve).mainFields ?? (_z.mainFields = (isSSRBuild ? [] : ["browser"]).concat(["module", "jsnext:main", "jsnext", "main"]));
-          (_A = pluginConfig.resolve).conditions ?? (_A.conditions = [
+          (_y = pluginConfig.resolve).mainFields ?? (_y.mainFields = (isSSRBuild ? [] : ["browser"]).concat(["module", "jsnext:main", "jsnext", "main"]));
+          (_z = pluginConfig.resolve).conditions ?? (_z.conditions = [
             isSSRBuild ? "node" : "browser",
             "import",
             "require",
@@ -2247,7 +2246,7 @@ function markoRun(opts = {}) {
         resolvedConfig = config2;
         const {
           ssr,
-          rollupOptions: { input }
+          rolldownOptions: { input }
         } = config2.build;
         if (typeof ssr === "string") {
           ssrEntryFiles = [ssr];
@@ -2458,11 +2457,11 @@ async function resolveAdapter(root, options, log) {
   }
   const pkg = await getPackageData(root);
   if (pkg) {
-    let dependecies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
+    let dependencies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
     if (pkg.devDependencies) {
-      dependecies = dependecies.concat(Object.keys(pkg.devDependencies));
+      dependencies = dependencies.concat(Object.keys(pkg.devDependencies));
     }
-    for (const name of dependecies) {
+    for (const name of dependencies) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module2 = await import(
@@ -2470,7 +2469,7 @@ async function resolveAdapter(root, options, log) {
             name
           );
           log && debug(
-            `Using adapter ${name} listed in your package.json dependecies`
+            `Using adapter ${name} listed in your package.json dependencies`
           );
           return module2.default();
         } catch (err) {
@@ -2492,6 +2491,9 @@ function getEntryFileName(file) {
   const match = file && markoEntryFileRegex.exec(file);
   return match ? match[1] : void 0;
 }
+function cleanFileName(name) {
+  return name.replace(/\.[^/.]+$/, "").replace(/[^a-zA-Z0-9._[\]-]+/g, "-").replace(/-{2,}/g, "-").replace(/^-|-$/g, "");
+}
 function getPlugin(config2) {
   return config2.plugins.find(
     (plugin) => plugin.name === `${PLUGIN_NAME_PREFIX}:pre`
@@ -2524,6 +2526,33 @@ var defaultConfigPlugin = {
     };
   }
 };
+function getBrowserslistTargets(path10) {
+  var _a;
+  const browserslistTarget = browserslist(void 0, { path: path10 });
+  if (browserslistTarget.length) {
+    const versions = /* @__PURE__ */ new Map();
+    for (const target of resolveToEsbuildTarget(browserslistTarget, {
+      printUnknownTargets: false
+    })) {
+      const index = (_a = /\d/.exec(target)) == null ? void 0 : _a.index;
+      if (index) {
+        const browser = target.slice(0, index);
+        const version = Number(target.slice(index));
+        const existingVersion = versions.get(browser);
+        if (!existingVersion || version < existingVersion) {
+          versions.set(browser, version);
+        }
+      }
+    }
+    if (versions.size) {
+      const targets = [];
+      for (const [browser, version] of versions) {
+        targets.push(browser + version);
+      }
+      return targets;
+    }
+  }
+}
 
 // src/vite/utils/server.ts
 import cp from "child_process";
@@ -2566,9 +2595,9 @@ import {
 // src/adapter/logger.ts
 import DraftLog from "draftlog";
 import format2 from "human-format";
-import inpspector from "inspector";
+import inspector from "inspector";
 import kleur3 from "kleur";
-if (!inpspector.url()) {
+if (!inspector.url()) {
   DraftLog.into(console);
   DraftLog.defaults.canReWrite = false;
 }
@@ -2755,7 +2784,7 @@ async function build(entry, cwd, configFile, outDir, envFile) {
       target: "esnext",
       ...buildConfig.build,
       ssr: entry,
-      rollupOptions: {
+      rolldownOptions: {
         output: {
           entryFileNames: "index.mjs"
           // Would rather build with `.js` extension but that will fail in zero-config projects where node runs in cjs mode

package/dist/runtime/internal.cjs

@@ -84,10 +84,10 @@ function getMetaDataLookup(data) {
 }
 
 // src/runtime/internal.ts
-var NotHandled = Symbol(
+var NotHandled = /* @__PURE__ */ Symbol(
   "marko-run not handled"
 );
-var NotMatched = Symbol(
+var NotMatched = /* @__PURE__ */ Symbol(
   "marko-run not matched"
 );
 var parentContextLookup = /* @__PURE__ */ new WeakMap();
@@ -154,15 +154,10 @@ function createContext(route, request, platform, url = new URL(request.url)) {
     serializedGlobals,
     parent: parentContextLookup.get(request),
     async fetch(resource, init) {
-      let request2;
-      let url2;
-      if (resource instanceof Request) {
-        request2 = new Request(resource, init);
-        url2 = new URL(request2.url);
-      } else {
-        url2 = typeof resource === "string" ? new URL(resource, this.url) : resource;
-        request2 = new Request(url2, init);
-      }
+      const request2 = new Request(
+        typeof resource === "string" ? new URL(resource, this.url) : resource,
+        init
+      );
       parentContextLookup.set(request2, this);
       return await globalThis.__marko_run__.fetch(request2, this.platform) || new Response(null, { status: 404 });
     },

package/dist/runtime/internal.js

@@ -42,10 +42,10 @@ function getMetaDataLookup(data) {
 }
 
 // src/runtime/internal.ts
-var NotHandled = Symbol(
+var NotHandled = /* @__PURE__ */ Symbol(
   "marko-run not handled"
 );
-var NotMatched = Symbol(
+var NotMatched = /* @__PURE__ */ Symbol(
   "marko-run not matched"
 );
 var parentContextLookup = /* @__PURE__ */ new WeakMap();
@@ -112,15 +112,10 @@ function createContext(route, request, platform, url = new URL(request.url)) {
     serializedGlobals,
     parent: parentContextLookup.get(request),
     async fetch(resource, init) {
-      let request2;
-      let url2;
-      if (resource instanceof Request) {
-        request2 = new Request(resource, init);
-        url2 = new URL(request2.url);
-      } else {
-        url2 = typeof resource === "string" ? new URL(resource, this.url) : resource;
-        request2 = new Request(url2, init);
-      }
+      const request2 = new Request(
+        typeof resource === "string" ? new URL(resource, this.url) : resource,
+        init
+      );
       parentContextLookup.set(request2, this);
       return await globalThis.__marko_run__.fetch(request2, this.platform) || new Response(null, { status: 404 });
     },