@cloudflare/vite-plugin 1.7.5 → 1.9.0

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

@@ -6168,7 +6168,7 @@ var worker_default = {
             dispatchType: "worker" /* WORKER */
           });
           let shouldBlockNonImageResponse = false;
-          if (url.pathname === "/_next/image") {
+          if (url.pathname.endsWith("/_next/image")) {
             const queryURLParam = url.searchParams.get("url");
             if (queryURLParam && !queryURLParam.startsWith("/")) {
               if (maybeSecondRequest.method !== "GET" || maybeSecondRequest.headers.get("sec-fetch-dest") !== "image") {
@@ -6179,7 +6179,9 @@ var worker_default = {
           }
           if (shouldBlockNonImageResponse) {
             const resp = await env.USER_WORKER.fetch(maybeSecondRequest);
-            if (!resp.headers.get("content-type")?.startsWith("image/") && resp.status !== 304) {
+            const isImage = resp.headers.get("content-type")?.startsWith("image/");
+            const isPlainText = resp.headers.get("content-type") === "text/plain";
+            if (!isImage && !isPlainText && resp.status !== 304) {
               analytics.setData({ abuseMitigationBlocked: true });
               return new Response("Blocked", { status: 403 });
             }

package/dist/index.js

@@ -13361,7 +13361,8 @@ function createCloudflareEnvironmentOptions(workerConfig, userConfig, environmen
     optimizeDeps: {
       // Note: ssr pre-bundling is opt-in and we need to enable it by setting `noDiscovery` to false
       noDiscovery: false,
-      entries: workerConfig.main,
+      // We need to normalize the path as it is treated as a glob and backslashes are therefore treated as escape characters.
+      entries: vite2.normalizePath(workerConfig.main),
       exclude: [...cloudflareBuiltInModules],
       esbuildOptions: {
         platform: "neutral",
@@ -13853,7 +13854,7 @@ async function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer, inspe
           }
         );
         const { externalWorkers: externalWorkers2 } = miniflareWorkerOptions;
-        const { ratelimits, ...workerOptions } = miniflareWorkerOptions.workerOptions;
+        const workerOptions = miniflareWorkerOptions.workerOptions;
         return {
           externalWorkers: externalWorkers2,
           worker: {
@@ -14084,7 +14085,7 @@ async function getPreviewMiniflareOptions(resolvedPluginConfig, vitePreviewServe
         }
       );
       const { externalWorkers } = miniflareWorkerOptions;
-      const { ratelimits, modulesRules, ...workerOptions } = miniflareWorkerOptions.workerOptions;
+      const { modulesRules, ...workerOptions } = miniflareWorkerOptions.workerOptions;
       logUnknownTails(
         workerOptions.tails,
         resolvedPluginConfig.workers,
@@ -14611,6 +14612,44 @@ function assertIsPreview(resolvedPluginConfig) {
   );
 }
 
+// src/vite-config.ts
+import assert10 from "node:assert";
+function validateWorkerEnvironmentOptions(resolvedPluginConfig, resolvedViteConfig) {
+  const workerEnvironmentNames = Object.keys(resolvedPluginConfig.workers);
+  const disallowedEnvironmentOptionsMap = /* @__PURE__ */ new Map();
+  for (const environmentName of workerEnvironmentNames) {
+    const environmentOptions = resolvedViteConfig.environments[environmentName];
+    assert10(
+      environmentOptions,
+      `Missing environment config for "${environmentName}"`
+    );
+    const { resolve: resolve8 } = environmentOptions;
+    const disallowedEnvironmentOptions = {};
+    if (resolve8.external === true || resolve8.external.length) {
+      disallowedEnvironmentOptions.resolveExternal = resolve8.external;
+    }
+    if (Object.keys(disallowedEnvironmentOptions).length) {
+      disallowedEnvironmentOptionsMap.set(
+        environmentName,
+        disallowedEnvironmentOptions
+      );
+    }
+  }
+  if (disallowedEnvironmentOptionsMap.size) {
+    const errorMessage = `The following environment options are incompatible with the Cloudflare Vite plugin:
+${[
+      ...disallowedEnvironmentOptionsMap
+    ].map(
+      ([environmentName, disallowedEnvironmentOptions]) => disallowedEnvironmentOptions.resolveExternal && `	- "${environmentName}" environment: \`resolve.external\`: ${JSON.stringify(disallowedEnvironmentOptions.resolveExternal)}
+`
+    ).join(
+      ""
+    )}To resolve this issue, avoid setting \`resolve.external\` in your Cloudflare Worker environments.
+`;
+    throw new Error(errorMessage);
+  }
+}
+
 // src/websockets.ts
 import { createHeaders } from "@mjackson/node-fetch-server";
 import { coupleWebSocket } from "miniflare";
@@ -14648,57 +14687,6 @@ function handleWebSocket(httpServer, getFetcher) {
   );
 }
 
-// src/worker-environments-validation.ts
-import assert10 from "node:assert";
-function validateWorkerEnvironmentsResolvedConfigs(resolvedPluginConfig, resolvedViteConfig) {
-  const workersEnvironmentNames = Object.keys(resolvedPluginConfig.workers);
-  const disallowedEnvsConfigs = /* @__PURE__ */ new Map();
-  for (const envName of workersEnvironmentNames) {
-    const workerEnvConfig = resolvedViteConfig.environments[envName];
-    assert10(workerEnvConfig, `Missing environment config for "${envName}"`);
-    const { optimizeDeps, resolve: resolve8 } = workerEnvConfig;
-    const disallowedConfig = {};
-    const disallowedOptimizeDepsExcludeEntries = (optimizeDeps.exclude ?? []).filter((entry) => {
-      if (cloudflareBuiltInModules.includes(entry)) {
-        return false;
-      }
-      if (isNodeAlsModule(entry) && isNodeAls(resolvedPluginConfig.workers[envName])) {
-        return false;
-      }
-      if (NODEJS_MODULES_RE.test(entry) && isNodeCompat(resolvedPluginConfig.workers[envName])) {
-        return false;
-      }
-      return true;
-    });
-    if (disallowedOptimizeDepsExcludeEntries.length > 0) {
-      disallowedConfig.optimizeDepsExclude = disallowedOptimizeDepsExcludeEntries;
-    }
-    if (resolve8.external === true || resolve8.external.length > 0) {
-      disallowedConfig.resolveExternal = resolve8.external;
-    }
-    if (Object.keys(disallowedConfig).length > 0) {
-      disallowedEnvsConfigs.set(envName, disallowedConfig);
-    }
-  }
-  if (disallowedEnvsConfigs.size > 0) {
-    const errorMessage = `The following environment configurations are incompatible with the Cloudflare Vite plugin:
-${[
-      ...disallowedEnvsConfigs
-    ].map(
-      ([envName, disallowedConfig]) => [
-        disallowedConfig.optimizeDepsExclude ? `	- "${envName}" environment: \`optimizeDeps.exclude\`: ${JSON.stringify(disallowedConfig.optimizeDepsExclude)}
-` : null,
-        disallowedConfig.resolveExternal ? `	- "${envName}" environment: \`resolve.external\`: ${JSON.stringify(disallowedConfig.resolveExternal)}
-` : null
-      ].join("")
-    ).join(
-      ""
-    )}To resolve this issue, avoid setting \`optimizeDeps.exclude\` and \`resolve.external\` in your Cloudflare Worker environments.
-`;
-    throw new Error(errorMessage);
-  }
-}
-
 // src/index.ts
 var workersConfigsWarningShown = false;
 var miniflare;
@@ -14778,7 +14766,7 @@ function cloudflare2(pluginConfig = {}) {
       configResolved(config) {
         resolvedViteConfig = config;
         if (resolvedPluginConfig.type === "workers") {
-          validateWorkerEnvironmentsResolvedConfigs(
+          validateWorkerEnvironmentOptions(
             resolvedPluginConfig,
             resolvedViteConfig
           );
@@ -15224,6 +15212,10 @@ function cloudflare2(pluginConfig = {}) {
       enforce: "pre",
       configureServer(viteDevServer) {
         assertIsNotPreview(resolvedPluginConfig);
+        const inVscodeJsDebugTerminal = !!process.env.VSCODE_INSPECTOR_OPTIONS;
+        if (inVscodeJsDebugTerminal) {
+          return;
+        }
         if (resolvedPluginConfig.type === "workers" && pluginConfig.inspectorPort !== false) {
           addDebugToVitePrintUrls(viteDevServer);
         }
@@ -15246,6 +15238,10 @@ function cloudflare2(pluginConfig = {}) {
       },
       async configurePreviewServer(vitePreviewServer) {
         assertIsPreview(resolvedPluginConfig);
+        const inVscodeJsDebugTerminal = !!process.env.VSCODE_INSPECTOR_OPTIONS;
+        if (inVscodeJsDebugTerminal) {
+          return;
+        }
         if (resolvedPluginConfig.workers.length >= 1 && resolvedPluginConfig.inspectorPort !== false) {
           addDebugToVitePrintUrls(vitePreviewServer);
         }