@cloudflare/vite-plugin 0.0.0-e55f489db → 0.0.0-e5ae13ade

package/dist/asset-workers/asset-worker.js

@@ -1,5 +1,5 @@
 // ../workers-shared/dist/asset-worker.mjs
-import { WorkerEntrypoint as lo } from "cloudflare:workers";
+import { WorkerEntrypoint as po } from "cloudflare:workers";
 var K = class {
   constructor(e) {
     this.performanceTimer = e;
@@ -2038,7 +2038,7 @@ var Zn = (t14) => {
 var Qe = (t14, e) => !!t14.compatibility_flags.find((n) => n === e.enable);
 var Jt = (t14) => {
   let e = Zn(t14);
-  return { compatibility_date: e.compatibilityDate, compatibility_flags: e.compatibilityFlags, html_handling: t14?.html_handling ?? "auto-trailing-slash", not_found_handling: t14?.not_found_handling ?? "none", redirects: t14?.redirects ?? { version: 1, staticRules: {}, rules: {} }, headers: t14?.headers ?? { version: 2, rules: {} }, account_id: t14?.account_id ?? -1, script_id: t14?.script_id ?? -1, debug: t14?.debug ?? false };
+  return { compatibility_date: e.compatibilityDate, compatibility_flags: e.compatibilityFlags, html_handling: t14?.html_handling ?? "auto-trailing-slash", not_found_handling: t14?.not_found_handling ?? "none", redirects: t14?.redirects ?? { version: 1, staticRules: {}, rules: {} }, headers: t14?.headers ?? { version: 2, rules: {} }, has_static_routing: t14?.has_static_routing ?? false, account_id: t14?.account_id ?? -1, script_id: t14?.script_id ?? -1, debug: t14?.debug ?? false };
 };
 var et = class {
   constructor(e) {
@@ -2149,19 +2149,21 @@ var Vt = (t14, e) => {
   for (let [n, r] of Object.entries(e)) t14 = t14.replaceAll(`:${n}`, r);
   return t14;
 };
+var to = (t14) => {
+  t14 = t14.split("*").map(Xs).join("(?<splat>.*)");
+  let e = t14.matchAll(Qs);
+  for (let r of e) t14 = t14.split(r[0]).join(`(?<${r[1]}>[^/.]+)`);
+  let n = t14.matchAll(eo);
+  for (let r of n) t14 = t14.split(r[0]).join(`(?<${r[1]}>[^/]+)`);
+  return t14 = "^" + t14 + "$", RegExp(t14);
+};
 var qt = (t14, e = (n) => n) => {
   if (!t14) return () => [];
   let n = Object.entries(t14).map(([r, s]) => {
     let o = r.startsWith("https://");
-    r = r.split("*").map(Xs).join("(?<splat>.*)");
-    let i = r.matchAll(Qs);
-    for (let c of i) r = r.split(c[0]).join(`(?<${c[1]}>[^/.]+)`);
-    let a = r.matchAll(eo);
-    for (let c of a) r = r.split(c[0]).join(`(?<${c[1]}>[^/]+)`);
-    r = "^" + r + "$";
     try {
-      let c = new RegExp(r);
-      return [{ crossHost: o, regExp: c }, s];
+      let i = to(r);
+      return [{ crossHost: o, regExp: i }, s];
     } catch {
     }
   }).filter((r) => r !== void 0);
@@ -2180,9 +2182,9 @@ var Qn = (t14, e, n) => {
 var er = (t14) => qt(t14.redirects.version === tr ? t14.redirects.rules : {}, ({ status: e, to: n }, r) => ({ status: e, to: Vt(n, r) }));
 function nr({ eTag: t14, resolver: e }, n, r, s, o) {
   let i = new Headers({ ETag: `"${t14}"` });
-  return n !== void 0 && i.append("Content-Type", n), to(s) && i.append("Cache-Control", Xn), i.append("CF-Cache-Status", r), o.debug && e === "not-found" && Qe(o, _e) && i.append("X-Mf-Additional-Response-Log", "`Sec-Fetch-Mode: navigate` header present - using `not_found_handling` behavior"), i;
+  return n !== void 0 && i.append("Content-Type", n), no(s) && i.append("Cache-Control", Xn), i.append("CF-Cache-Status", r), o.debug && e === "not-found" && Qe(o, _e) && i.append("X-Mf-Additional-Response-Log", "`Sec-Fetch-Mode: navigate` header present - using `not_found_handling` behavior"), i;
 }
-function to(t14) {
+function no(t14) {
   return !t14.headers.has("Authorization") && !t14.headers.has("Range");
 }
 function rr(t14, e, n, r) {
@@ -2205,19 +2207,19 @@ function rr(t14, e, n, r) {
 var tr = 1;
 var sr = 2;
 var or = async (t14, e, n, r) => {
-  let s = new URL(t14.url), { search: o } = s, i = uo(e, t14, n, s.host, s.pathname, o);
+  let s = new URL(t14.url), { search: o } = s, i = lo(e, t14, n, s.host, s.pathname, o);
   if (i instanceof Response) return i;
-  let { proxied: a, pathname: c } = i, u = ao(c), l = await cr(u, t14, n, r);
+  let { proxied: a, pathname: c } = i, u = co(c), l = await cr(u, t14, n, r);
   if (!l) {
     let m = a ? new B() : new Ee();
     return e.JAEGER.enterSpan("no_intent", (W) => (W.setTags({ decodedPathname: u, configuration: JSON.stringify(n), proxied: a, status: m.status }), m));
   }
   let p = t14.method.toUpperCase();
   if (!["GET", "HEAD"].includes(p)) return e.JAEGER.enterSpan("method_not_allowed", (m) => (m.setTags({ method: p, status: Se.status }), new Se()));
-  let f = l.redirect ?? u, d = co(f);
+  let f = l.redirect ?? u, d = uo(f);
   return d !== c && l.asset || l.redirect ? e.JAEGER.enterSpan("redirect", (m) => (m.setTags({ originalPath: c, location: d !== c ? d : l.redirect ?? "<unknown>", status: q.status }), new q(d + o))) : l.asset ? { ...l.asset, resolver: l.resolver } : e.JAEGER.enterSpan("unknown_action", (m) => (m.setTags({ pathname: c, status: H.status }), new H(new Error("Unknown action"))));
 };
-var no = async (t14, e, n, r, s, o) => {
+var ro = async (t14, e, n, r, s, o) => {
   let { pathname: i } = new URL(e.url), a = e.method.toUpperCase(), c = await n.JAEGER.enterSpan("getByETag", async (d) => (d.setTags({ pathname: i, eTag: t14.eTag, status: t14.status }), await s(t14.eTag, e))), u = nr(t14, c.contentType, c.cacheStatus, e, r);
   o.setData({ cacheStatus: c.cacheStatus });
   let l = `"${t14.eTag}"`, p = `W/${l}`, f = e.headers.get("If-None-Match") || "";
@@ -2232,24 +2234,24 @@ var no = async (t14, e, n, r, s, o) => {
     }
   });
 };
-var ir = async (t14, e, n, r) => (Qe(n, _e) && t14.headers.get("Sec-Fetch-Mode") === "navigate" || (n = { ...n, not_found_handling: "none" }), !(await or(t14, e, n, r) instanceof Ee));
+var ir = async (t14, e, n, r) => (Qe(n, _e) && t14.headers.get("Sec-Fetch-Mode") === "navigate" && !n.has_static_routing || (n = { ...n, not_found_handling: "none" }), !(await or(t14, e, n, r) instanceof Ee));
 var ar = async (t14, e, n, r, s, o) => {
-  let i = await or(t14, e, n, r), a = i instanceof Response ? i : await no(i, t14, e, n, s, o);
+  let i = await or(t14, e, n, r), a = i instanceof Response ? i : await ro(i, t14, e, n, s, o);
   return rr(t14, a, n, e);
 };
 var cr = async (t14, e, n, r, s = false) => {
   switch (n.html_handling) {
     case "auto-trailing-slash":
-      return ro(t14, e, n, r, s);
-    case "force-trailing-slash":
       return so(t14, e, n, r, s);
-    case "drop-trailing-slash":
+    case "force-trailing-slash":
       return oo(t14, e, n, r, s);
+    case "drop-trailing-slash":
+      return io(t14, e, n, r, s);
     case "none":
-      return io(t14, e, n, r);
+      return ao(t14, e, n, r);
   }
 };
-var ro = async (t14, e, n, r, s) => {
+var so = async (t14, e, n, r, s) => {
   let o = null, i = null, a = await r(t14, e);
   if (t14.endsWith("/index")) {
     if (a) return { asset: { eTag: a, status: y.status }, redirect: null, resolver: "html-handling" };
@@ -2267,7 +2269,7 @@ var ro = async (t14, e, n, r, s) => {
   }
   return a ? { asset: { eTag: a, status: y.status }, redirect: null, resolver: "html-handling" } : (i = await r(`${t14}.html`, e)) ? { asset: { eTag: i, status: y.status }, redirect: null, resolver: "html-handling" } : (o = await E(`${t14}/index.html`, e, `${t14}/`, n, r, s, "html-handling")) ? o : tt(t14, e, n, r);
 };
-var so = async (t14, e, n, r, s) => {
+var oo = async (t14, e, n, r, s) => {
   let o = null, i = null, a = await r(t14, e);
   if (t14.endsWith("/index")) {
     if (a) return { asset: { eTag: a, status: y.status }, redirect: null, resolver: "html-handling" };
@@ -2286,7 +2288,7 @@ var so = async (t14, e, n, r, s) => {
   }
   return a ? { asset: { eTag: a, status: y.status }, redirect: null, resolver: "html-handling" } : (o = await E(`${t14}.html`, e, `${t14}/`, n, r, s, "html-handling")) || (o = await E(`${t14}/index.html`, e, `${t14}/`, n, r, s, "html-handling")) ? o : tt(t14, e, n, r);
 };
-var oo = async (t14, e, n, r, s) => {
+var io = async (t14, e, n, r, s) => {
   let o = null, i = null, a = await r(t14, e);
   if (t14.endsWith("/index")) {
     if (a) return { asset: { eTag: a, status: y.status }, redirect: null, resolver: "html-handling" };
@@ -2315,7 +2317,7 @@ var oo = async (t14, e, n, r, s) => {
   }
   return a ? { asset: { eTag: a, status: y.status }, redirect: null, resolver: "html-handling" } : (i = await r(`${t14}.html`, e)) ? { asset: { eTag: i, status: y.status }, redirect: null, resolver: "html-handling" } : (i = await r(`${t14}/index.html`, e)) ? { asset: { eTag: i, status: y.status }, redirect: null, resolver: "html-handling" } : tt(t14, e, n, r);
 };
-var io = async (t14, e, n, r) => {
+var ao = async (t14, e, n, r) => {
   let s = await r(t14, e);
   return s ? { asset: { eTag: s, status: y.status }, redirect: null, resolver: "html-handling" } : tt(t14, e, n, r);
 };
@@ -2347,21 +2349,21 @@ var E = async (t14, e, n, r, s, o, i) => {
   }
   return null;
 };
-var ao = (t14) => t14.split("/").map((e) => {
+var co = (t14) => t14.split("/").map((e) => {
   try {
     return decodeURIComponent(e);
   } catch {
     return e;
   }
 }).join("/").replace(/\/+/g, "/");
-var co = (t14) => t14.split("/").map((e) => {
+var uo = (t14) => t14.split("/").map((e) => {
   try {
     return encodeURIComponent(e);
   } catch {
     return e;
   }
 }).join("/");
-var uo = (t14, e, n, r, s, o) => (t14.JAEGER ?? v()).enterSpan("handle_redirects", (a) => {
+var lo = (t14, e, n, r, s, o) => (t14.JAEGER ?? v()).enterSpan("handle_redirects", (a) => {
   let c = Qn(n, r, s) || er(n)({ request: e })[0], u = false;
   if (c) if (c.status === 200) s = new URL(c.to, e.url).pathname, u = true, a.setTags({ matched: true, proxied: true, new_path: s, status: c.status });
   else {
@@ -2415,7 +2417,7 @@ async function pr(t14, e, n, r = 1) {
     await new Promise((i) => setTimeout(i, Math.pow(2, s++) * 1e3));
   }
 }
-var dr = class extends lo {
+var dr = class extends po {
   async fetch(t14) {
     let e, n = new Ke(this.env.ANALYTICS), r = new K(this.env.UNSAFE_PERFORMANCE), s = r.now();
     try {
@@ -2476,7 +2478,7 @@ var ADDITIONAL_MODULE_TYPES = [
 
 // src/shared.ts
 var UNKNOWN_HOST = "http://localhost";
-var ADDITIONAL_MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${ADDITIONAL_MODULE_TYPES.join("|")})__(.*?)__`;
+var ADDITIONAL_MODULE_PATTERN = `__CLOUDFLARE_MODULE__(${ADDITIONAL_MODULE_TYPES.join("|")})__(.*?)__CLOUDFLARE_MODULE__`;
 var additionalModuleRE = new RegExp(ADDITIONAL_MODULE_PATTERN);
 var additionalModuleGlobalRE = new RegExp(
   ADDITIONAL_MODULE_PATTERN,