@cloudflare/vite-plugin 1.4.0 → 1.5.1

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

@@ -4728,6 +4728,7 @@ var normalizeConfiguration = (configuration) => {
       version: 2,
       rules: {}
     },
+    has_static_routing: configuration?.has_static_routing ?? false,
     account_id: configuration?.account_id ?? -1,
     script_id: configuration?.script_id ?? -1,
     debug: configuration?.debug ?? false
@@ -4906,24 +4907,27 @@ var replacer = (str, replacements) => {
   }
   return str;
 };
+var generateRuleRegExp = (rule) => {
+  rule = rule.split("*").map(escapeRegex).join("(?<splat>.*)");
+  const host_matches = rule.matchAll(HOST_PLACEHOLDER_REGEX);
+  for (const host_match of host_matches) {
+    rule = rule.split(host_match[0]).join(`(?<${host_match[1]}>[^/.]+)`);
+  }
+  const path_matches = rule.matchAll(PLACEHOLDER_REGEX);
+  for (const path_match of path_matches) {
+    rule = rule.split(path_match[0]).join(`(?<${path_match[1]}>[^/]+)`);
+  }
+  rule = "^" + rule + "$";
+  return RegExp(rule);
+};
 var generateRulesMatcher = (rules, replacerFn = (match) => match) => {
   if (!rules) {
     return () => [];
   }
   const compiledRules = Object.entries(rules).map(([rule, match]) => {
     const crossHost = rule.startsWith("https://");
-    rule = rule.split("*").map(escapeRegex).join("(?<splat>.*)");
-    const host_matches = rule.matchAll(HOST_PLACEHOLDER_REGEX);
-    for (const host_match of host_matches) {
-      rule = rule.split(host_match[0]).join(`(?<${host_match[1]}>[^/.]+)`);
-    }
-    const path_matches = rule.matchAll(PLACEHOLDER_REGEX);
-    for (const path_match of path_matches) {
-      rule = rule.split(path_match[0]).join(`(?<${path_match[1]}>[^/]+)`);
-    }
-    rule = "^" + rule + "$";
     try {
-      const regExp = new RegExp(rule);
+      const regExp = generateRuleRegExp(rule);
       return [{ crossHost, regExp }, match];
     } catch {
     }
@@ -5140,10 +5144,11 @@ var resolveAssetIntentToResponse = async (assetIntent, request, env, configurati
   });
 };
 var canFetch = async (request, env, configuration, exists) => {
-  if (!(flagIsEnabled(
+  const shouldKeepNotFoundHandling = configuration.has_static_routing || flagIsEnabled(
     configuration,
     SEC_FETCH_MODE_NAVIGATE_HEADER_PREFERS_ASSET_SERVING
-  ) && request.headers.get("Sec-Fetch-Mode") === "navigate")) {
+  ) && request.headers.get("Sec-Fetch-Mode") === "navigate";
+  if (!shouldKeepNotFoundHandling) {
     configuration = {
       ...configuration,
       not_found_handling: "none"
@@ -5994,6 +5999,7 @@ var ADDITIONAL_MODULE_TYPES = [
   "Data",
   "Text"
 ];
+var kRequestType = Symbol("kRequestType");
 
 // src/shared.ts
 var UNKNOWN_HOST = "http://localhost";
@@ -6017,7 +6023,7 @@ var CustomAssetWorker = class extends worker_default {
     const url = new URL(eTag, UNKNOWN_HOST);
     const response = await this.env.__VITE_FETCH_ASSET__.fetch(url);
     if (!response.body) {
-      throw new Error(`Unexpected error. No HTML found for ${eTag}.`);
+      throw new Error(`Unexpected error. No HTML found for "${eTag}".`);
     }
     return {
       readableStream: response.body,

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

@@ -1,3 +1,60 @@
+// ../workers-shared/utils/tracing.ts
+function mockJaegerBindingSpan() {
+  return {
+    addLogs: () => {
+    },
+    setTags: () => {
+    },
+    end: () => {
+    },
+    isRecording: true
+  };
+}
+function mockJaegerBinding() {
+  return {
+    enterSpan: (_, span, ...args) => {
+      return span(mockJaegerBindingSpan(), ...args);
+    },
+    getSpanContext: () => ({
+      traceId: "test-trace",
+      spanId: "test-span",
+      parentSpanId: "test-parent-span",
+      traceFlags: 0
+    }),
+    runWithSpanContext: (_, callback, ...args) => {
+      return callback(...args);
+    },
+    traceId: "test-trace",
+    spanId: "test-span",
+    parentSpanId: "test-parent-span",
+    cfTraceIdHeader: "test-trace:test-span:0"
+  };
+}
+
+// ../workers-shared/asset-worker/src/utils/rules-engine.ts
+var ESCAPE_REGEX_CHARACTERS = /[-/\\^$*+?.()|[\]{}]/g;
+var escapeRegex = (str) => {
+  return str.replace(ESCAPE_REGEX_CHARACTERS, "\\$&");
+};
+var generateGlobOnlyRuleRegExp = (rule) => {
+  rule = rule.split("*").map(escapeRegex).join(".*");
+  rule = "^" + rule + "$";
+  return RegExp(rule);
+};
+var generateStaticRoutingRuleMatcher = (rules) => ({ request }) => {
+  const { pathname } = new URL(request.url);
+  for (const rule of rules) {
+    try {
+      const regExp = generateGlobOnlyRuleRegExp(rule);
+      if (regExp.test(pathname)) {
+        return true;
+      }
+    } catch {
+    }
+  }
+  return false;
+};
+
 // ../workers-shared/utils/performance.ts
 var PerformanceTimer = class {
   performanceTimer;
@@ -4483,39 +4540,6 @@ function setupSentry(request, context, dsn, clientId, clientSecret, coloMetadata
   return sentry;
 }
 
-// ../workers-shared/utils/tracing.ts
-function mockJaegerBindingSpan() {
-  return {
-    addLogs: () => {
-    },
-    setTags: () => {
-    },
-    end: () => {
-    },
-    isRecording: true
-  };
-}
-function mockJaegerBinding() {
-  return {
-    enterSpan: (_, span, ...args) => {
-      return span(mockJaegerBindingSpan(), ...args);
-    },
-    getSpanContext: () => ({
-      traceId: "test-trace",
-      spanId: "test-span",
-      parentSpanId: "test-parent-span",
-      traceFlags: 0
-    }),
-    runWithSpanContext: (_, callback, ...args) => {
-      return callback(...args);
-    },
-    traceId: "test-trace",
-    spanId: "test-span",
-    parentSpanId: "test-parent-span",
-    cfTraceIdHeader: "test-trace:test-span:0"
-  };
-}
-
 // ../workers-shared/router-worker/src/analytics.ts
 var VERSION = 1;
 var Analytics = class {
@@ -4551,7 +4575,9 @@ var Analytics = class {
         // double3
         this.data.coloTier ?? -1,
         // double4
-        this.data.userWorkerAhead === void 0 ? -1 : Number(this.data.userWorkerAhead)
+        this.data.userWorkerAhead === void 0 ? -1 : Number(this.data.userWorkerAhead),
+        this.data.staticRoutingDecision ?? 0 /* NOT_PROVIDED */
+        // double6
       ],
       blobs: [
         this.data.hostname?.substring(0, 256),
@@ -4576,7 +4602,10 @@ var applyConfigurationDefaults = (configuration) => {
     has_user_worker: configuration?.has_user_worker ?? false,
     account_id: configuration?.account_id ?? -1,
     script_id: configuration?.script_id ?? -1,
-    debug: configuration?.debug ?? false
+    debug: configuration?.debug ?? false,
+    static_routing: configuration?.static_routing ?? {
+      user_worker: []
+    }
   };
 };
 
@@ -4603,6 +4632,7 @@ var worker_default = {
         env.CONFIG?.account_id,
         env.CONFIG?.script_id
       );
+      const hasStaticRouting = env.CONFIG.static_routing !== void 0;
       const config = applyConfigurationDefaults(env.CONFIG);
       const url = new URL(request.url);
       if (env.COLO_METADATA && env.VERSION_METADATA && env.CONFIG) {
@@ -4619,6 +4649,55 @@ var worker_default = {
         });
       }
       const maybeSecondRequest = request.clone();
+      if (config.static_routing) {
+        const excludeRulesMatcher = generateStaticRoutingRuleMatcher(
+          config.static_routing.asset_worker ?? []
+        );
+        if (excludeRulesMatcher({
+          request
+        })) {
+          analytics.setData({
+            dispatchtype: "asset" /* ASSETS */,
+            staticRoutingDecision: 2 /* ROUTED */
+          });
+          return await env.JAEGER.enterSpan("dispatch_assets", async (span) => {
+            span.setTags({
+              hasUserWorker: config.has_user_worker,
+              asset: "static_routing",
+              dispatchType: "asset" /* ASSETS */
+            });
+            return env.ASSET_WORKER.fetch(maybeSecondRequest);
+          });
+        }
+        const includeRulesMatcher = generateStaticRoutingRuleMatcher(
+          config.static_routing.user_worker
+        );
+        if (includeRulesMatcher({
+          request
+        })) {
+          if (!config.has_user_worker) {
+            throw new Error(
+              "Fetch for user worker without having a user worker binding"
+            );
+          }
+          analytics.setData({
+            dispatchtype: "worker" /* WORKER */,
+            staticRoutingDecision: 2 /* ROUTED */
+          });
+          return await env.JAEGER.enterSpan("dispatch_worker", async (span) => {
+            span.setTags({
+              hasUserWorker: true,
+              asset: "static_routing",
+              dispatchType: "worker" /* WORKER */
+            });
+            userWorkerInvocation = true;
+            return env.USER_WORKER.fetch(maybeSecondRequest);
+          });
+        }
+        analytics.setData({
+          staticRoutingDecision: hasStaticRouting ? 1 /* NOT_ROUTED */ : 0 /* NOT_PROVIDED */
+        });
+      }
       if (config.invoke_user_worker_ahead_of_assets) {
         if (!config.has_user_worker) {
           throw new Error(

package/dist/index.js

@@ -1571,6 +1571,7 @@ var ADDITIONAL_MODULE_TYPES = [
   "Text"
 ];
 var DEFAULT_INSPECTOR_PORT = 9229;
+var kRequestType = Symbol("kRequestType");
 
 // src/additional-modules.ts
 var moduleRules = [
@@ -5787,8 +5788,13 @@ var InternalConfigSchema = z.object({
   script_id: z.number().optional(),
   debug: z.boolean().optional()
 });
+var StaticRoutingSchema = z.object({
+  user_worker: z.array(z.string()),
+  asset_worker: z.array(z.string()).optional()
+});
 var RouterConfigSchema = z.object({
   invoke_user_worker_ahead_of_assets: z.boolean().optional(),
+  static_routing: StaticRoutingSchema.optional(),
   has_user_worker: z.boolean().optional(),
   ...InternalConfigSchema.shape
 });
@@ -5829,6 +5835,7 @@ var AssetConfigSchema = z.object({
   not_found_handling: z.enum(["single-page-application", "404-page", "none"]).optional(),
   redirects: RedirectsSchema,
   headers: HeadersSchema,
+  has_static_routing: z.boolean().optional(),
   ...InternalConfigSchema.shape
 });
 
@@ -12648,8 +12655,8 @@ function packageResolve(specifier, base, conditions) {
   let packageJsonPath = fileURLToPath$1(packageJsonUrl);
   let lastPath;
   do {
-    const stat = tryStatSync(packageJsonPath.slice(0, -13));
-    if (!stat || !stat.isDirectory()) {
+    const stat2 = tryStatSync(packageJsonPath.slice(0, -13));
+    if (!stat2 || !stat2.isDirectory()) {
       lastPath = packageJsonPath;
       packageJsonUrl = new URL$1(
         (isScoped ? "../../../../node_modules/" : "../../../node_modules/") + packageName + "/package.json",
@@ -12779,8 +12786,8 @@ function _resolve(id, options = {}) {
   }
   if (isAbsolute(id)) {
     try {
-      const stat = statSync(id);
-      if (stat.isFile()) {
+      const stat2 = statSync(id);
+      if (stat2.isFile()) {
         return pathToFileURL(id);
       }
     } catch (error) {
@@ -13010,9 +13017,6 @@ function getOutputDirectory(userConfig, environmentName) {
   const rootOutputDirectory = userConfig.build?.outDir ?? "dist";
   return userConfig.environments?.[environmentName]?.build?.outDir ?? path4.join(rootOutputDirectory, environmentName);
 }
-function getRouterWorker(miniflare2) {
-  return miniflare2.getWorker(ROUTER_WORKER_NAME);
-}
 function toMiniflareRequest(request) {
   const host = request.headers.get("Host");
   if (host) {
@@ -13522,12 +13526,14 @@ async function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspe
       serviceBindings: {
         __VITE_ASSET_EXISTS__: async (request) => {
           const { pathname } = new URL(request.url);
-          const filePath = path6.join(resolvedViteConfig.root, pathname);
-          let exists;
-          try {
-            exists = fs3.statSync(filePath).isFile();
-          } catch (error) {
-            exists = false;
+          let exists = false;
+          if (pathname.endsWith(".html")) {
+            try {
+              const filePath = path6.join(resolvedViteConfig.root, pathname);
+              const stats = await fsp.stat(filePath);
+              exists = stats.isFile();
+            } catch (error) {
+            }
           }
           return MiniflareResponse.json(exists);
         },
@@ -13541,7 +13547,7 @@ async function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspe
               headers: { "Content-Type": "text/html" }
             });
           } catch (error) {
-            throw new Error(`Unexpected error. Failed to load ${pathname}`);
+            throw new Error(`Unexpected error. Failed to load "${pathname}".`);
           }
         }
       }
@@ -13579,7 +13585,12 @@ async function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspe
             serviceBindings: {
               ...workerOptions.serviceBindings,
               ...environmentName === resolvedPluginConfig.entryWorkerEnvironmentName && workerConfig.assets?.binding ? {
-                [workerConfig.assets.binding]: ASSET_WORKER_NAME
+                [workerConfig.assets.binding]: {
+                  node: (req, res) => {
+                    req[kRequestType] = "asset";
+                    viteDevServer.middlewares(req, res);
+                  }
+                }
               } : {},
               __VITE_INVOKE_MODULE__: async (request) => {
                 const payload = await request.json();
@@ -14522,7 +14533,7 @@ function cloudflare2(pluginConfig = {}) {
         if (viteDevServer.httpServer) {
           handleWebSocket(viteDevServer.httpServer, async () => {
             assert10(miniflare, `Miniflare not defined`);
-            const routerWorker = await getRouterWorker(miniflare);
+            const routerWorker = await miniflare.getWorker(ROUTER_WORKER_NAME);
             return routerWorker.fetch;
           });
         }
@@ -14530,14 +14541,21 @@ function cloudflare2(pluginConfig = {}) {
           viteDevServer.middlewares.use(async (req, res, next) => {
             try {
               assert10(miniflare, `Miniflare not defined`);
-              const routerWorker = await getRouterWorker(miniflare);
               const request = createRequest(req, res);
-              const response = await routerWorker.fetch(
-                toMiniflareRequest(request),
-                {
-                  redirect: "manual"
-                }
-              );
+              let response;
+              if (req[kRequestType] === "asset") {
+                const assetWorker = await miniflare.getWorker(ASSET_WORKER_NAME);
+                response = await assetWorker.fetch(
+                  toMiniflareRequest(request),
+                  { redirect: "manual" }
+                );
+              } else {
+                const routerWorker = await miniflare.getWorker(ROUTER_WORKER_NAME);
+                response = await routerWorker.fetch(
+                  toMiniflareRequest(request),
+                  { redirect: "manual" }
+                );
+              }
               if (req.httpVersionMajor === 2) {
                 response.headers.delete("transfer-encoding");
               }

package/dist/runner-worker/index.js

@@ -11,6 +11,7 @@ var ADDITIONAL_MODULE_TYPES = [
   "Data",
   "Text"
 ];
+var kRequestType = Symbol("kRequestType");
 
 // src/shared.ts
 var UNKNOWN_HOST = "http://localhost";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -41,22 +41,21 @@
     "tinyglobby": "^0.2.12",
     "unenv": "2.0.0-rc.17",
     "ws": "8.18.0",
-    "wrangler": "4.19.0",
-    "miniflare": "4.20250525.1"
+    "miniflare": "4.20250604.0",
+    "wrangler": "4.19.2"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250525.0",
+    "@cloudflare/workers-types": "^4.20250604.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
     "mlly": "^1.7.4",
     "tsup": "8.3.0",
     "typescript": "^5.7.2",
-    "undici": "^5.28.5",
     "vite": "^6.1.0",
     "vitest": "~3.1.1",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "@cloudflare/workers-shared": "0.17.5",
+    "@cloudflare/workers-shared": "0.17.6",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {