@cloudflare/vite-plugin 0.0.0-e62b097bb → 0.0.0-e7c7235fd

package/README.md

@@ -466,13 +466,6 @@ The value of `MY_VAR` will therefore be `'Production var'`.
 If you run `vite build --mode staging` then the 'staging' Vite mode will be used and the 'staging' Cloudflare environment will be selected.
 The value of `MY_VAR` will therefore be `'Staging var'`.
 
-## Secrets
-
-Secrets can be provided to your Worker in local development using a [`.dev.vars`](https://developers.cloudflare.com/workers/configuration/secrets/#local-development-with-secrets) file. If you are using [Cloudflare Environments](#cloudflare-environments) then the relevant `.dev.vars` file will be selected. For example, `CLOUDFLARE_ENV=staging vite dev` will load `.dev.vars.staging` if it exists and fall back to `.dev.vars`.
-
-> [!NOTE]
-> The `vite build` command copies the relevant `.dev.vars[.env-name]` file to the output directory. This is only used when running `vite preview` and is not deployed with your Worker.
-
 ## Migrating from `wrangler dev`
 
 Migrating from `wrangler dev` is a simple process and you can follow the instructions in the [Quick start](#quick-start) to get started.

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

@@ -2359,10 +2359,7 @@ var vs = (t, e) => {
   return 0;
 };
 var ks = (t) => [...t.slice(16, 16 + 16)].map((n) => n.toString(16).padStart(2, "0")).join("");
-var Ut = (t) => {
-  let e;
-  return t?.run_worker_first !== void 0 ? e = t?.run_worker_first : t?.serve_directly !== void 0 ? e = !t.serve_directly : e = false, { html_handling: t?.html_handling ?? "auto-trailing-slash", not_found_handling: t?.not_found_handling ?? "none", run_worker_first: e, serve_directly: !e };
-};
+var Ut = (t) => ({ html_handling: t?.html_handling ?? "auto-trailing-slash", not_found_handling: t?.not_found_handling ?? "none", serve_directly: t?.serve_directly ?? true });
 var Zn = "public, max-age=0, must-revalidate";
 function Qn(t, e, n) {
   let r = new Headers({ "Content-Type": e, ETag: `"${t}"` });
@@ -2526,11 +2523,8 @@ async function tr(t, e, n, r = 1) {
       return o.value !== null && n && n.captureException(new Error(`Initial request for asset ${e} failed, but subsequent request succeeded.`)), o;
     }
     return i;
-  } catch (i) {
-    if (s >= r) {
-      let o = `KV GET ${e} failed.`;
-      throw i instanceof Error && (o = `KV GET ${e} failed: ${i.message}`), new Error(o);
-    }
+  } catch {
+    if (s >= r) throw new Error(`Requested asset ${e} could not be fetched from KV namespace.`);
     await new Promise((o) => setTimeout(o, Math.pow(2, s++) * 1e3));
   }
 }
@@ -2542,9 +2536,8 @@ var nr = class extends Bs {
       let i = Ut(this.env.CONFIG), o = t.headers.get("user-agent") ?? "UA UNKNOWN", a = new URL(t.url);
       return this.env.COLO_METADATA && this.env.VERSION_METADATA && this.env.CONFIG && n.setData({ accountId: this.env.CONFIG.account_id, scriptId: this.env.CONFIG.script_id, coloId: this.env.COLO_METADATA.coloId, metalId: this.env.COLO_METADATA.metalId, coloTier: this.env.COLO_METADATA.coloTier, coloRegion: this.env.COLO_METADATA.coloRegion, version: this.env.VERSION_METADATA.id, hostname: a.hostname, htmlHandling: i.html_handling, notFoundHandling: i.not_found_handling, userAgent: o }), await this.env.JAEGER.enterSpan("handleRequest", async (c) => (c.setTags({ hostname: a.hostname, eyeballPath: a.pathname, env: this.env.ENVIRONMENT, version: this.env.VERSION_METADATA?.id }), er(t, this.env, i, this.unstable_exists.bind(this), this.unstable_getByETag.bind(this))));
     } catch (i) {
-      return this.handleError(e, n, i);
-    } finally {
-      this.submitMetrics(n, r, s);
+      let o = this.handleError(e, n, i);
+      return this.submitMetrics(n, r, s), o;
     }
   }
   handleError(t, e, n) {

package/dist/index.js

@@ -1637,13 +1637,10 @@ function getDevMiniflareOptions(resolvedPluginConfig, viteDevServer) {
   ];
   const userWorkers = resolvedPluginConfig.type === "workers" ? Object.entries(resolvedPluginConfig.workers).map(
     ([environmentName, workerConfig]) => {
-      const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(
-        {
-          ...workerConfig,
-          assets: void 0
-        },
-        resolvedPluginConfig.cloudflareEnv
-      );
+      const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions({
+        ...workerConfig,
+        assets: void 0
+      });
       const { ratelimits, ...workerOptions } = miniflareWorkerOptions.workerOptions;
       return {
         ...workerOptions,
@@ -2067,21 +2064,20 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
   const configPaths = /* @__PURE__ */ new Set();
   const persistState = pluginConfig.persistState ?? true;
   const root = userConfig.root ? path5.resolve(userConfig.root) : process.cwd();
-  const { CLOUDFLARE_ENV: cloudflareEnv } = vite5.loadEnv(
-    viteEnv.mode,
-    root,
-    /* prefixes */
-    ""
-  );
+  const { CLOUDFLARE_ENV } = vite5.loadEnv(viteEnv.mode, root, "");
   const configPath = pluginConfig.configPath ? path5.resolve(root, pluginConfig.configPath) : findWranglerConfig(root);
   assert6(
     configPath,
     `Config not found. Have you created a wrangler.json(c) or wrangler.toml file?`
   );
-  const entryWorkerResolvedConfig = getWorkerConfig(configPath, cloudflareEnv, {
-    visitedConfigPaths: configPaths,
-    isEntryWorker: true
-  });
+  const entryWorkerResolvedConfig = getWorkerConfig(
+    configPath,
+    CLOUDFLARE_ENV,
+    {
+      visitedConfigPaths: configPaths,
+      isEntryWorker: true
+    }
+  );
   if (entryWorkerResolvedConfig.type === "assets-only") {
     return {
       type: "assets-only",
@@ -2090,8 +2086,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
       persistState,
       rawConfigs: {
         entryWorker: entryWorkerResolvedConfig
-      },
-      cloudflareEnv
+      }
     };
   }
   const entryWorkerConfig = entryWorkerResolvedConfig.config;
@@ -2103,7 +2098,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
   for (const auxiliaryWorker of pluginConfig.auxiliaryWorkers ?? []) {
     const workerResolvedConfig = getWorkerConfig(
       path5.resolve(root, auxiliaryWorker.configPath),
-      cloudflareEnv,
+      CLOUDFLARE_ENV,
       {
         visitedConfigPaths: configPaths
       }
@@ -2131,8 +2126,7 @@ function resolvePluginConfig(pluginConfig, userConfig, viteEnv) {
     rawConfigs: {
       entryWorker: entryWorkerResolvedConfig,
       auxiliaryWorkers: auxiliaryWorkersResolvedConfigs
-    },
-    cloudflareEnv
+    }
   };
 }
 
@@ -2323,28 +2317,13 @@ function cloudflare2(pluginConfig = {}) {
           );
         }
         config = workerConfig;
-        if (workerConfig.configPath) {
-          const dotDevDotVarsContent = getDotDevDotVarsContent(
-            workerConfig.configPath,
-            resolvedPluginConfig.cloudflareEnv
-          );
-          if (dotDevDotVarsContent) {
-            this.emitFile({
-              type: "asset",
-              fileName: ".dev.vars",
-              source: dotDevDotVarsContent
-            });
-          }
-        }
       } else if (this.environment.name === "client") {
         const assetsOnlyConfig = resolvedPluginConfig.config;
         assetsOnlyConfig.assets.directory = ".";
-        const filesToAssetsIgnore = ["wrangler.json", ".dev.vars"];
         this.emitFile({
           type: "asset",
           fileName: ".assetsignore",
-          source: `${filesToAssetsIgnore.join("\n")}
-`
+          source: "wrangler.json"
         });
         config = assetsOnlyConfig;
       }
@@ -2424,17 +2403,6 @@ function cloudflare2(pluginConfig = {}) {
     }
   };
 }
-function getDotDevDotVarsContent(configPath, cloudflareEnv) {
-  const configDir = path6.dirname(configPath);
-  const defaultDotDevDotVarsPath = `${configDir}/.dev.vars`;
-  const inputDotDevDotVarsPath = `${defaultDotDevDotVarsPath}${cloudflareEnv ? `.${cloudflareEnv}` : ""}`;
-  const targetPath = fs4.existsSync(inputDotDevDotVarsPath) ? inputDotDevDotVarsPath : fs4.existsSync(defaultDotDevDotVarsPath) ? defaultDotDevDotVarsPath : null;
-  if (targetPath) {
-    const dotDevDotVarsContent = fs4.readFileSync(targetPath);
-    return dotDevDotVarsContent;
-  }
-  return null;
-}
 export {
   cloudflare2 as cloudflare
 };

package/dist/runner-worker/index.js

@@ -21,7 +21,7 @@ function stripInternalEnv(internalEnv) {
   return userEnv;
 }
 
-// ../../node_modules/.pnpm/vite@6.0.7_@types+node@18.19.74_jiti@2.4.2/node_modules/vite/dist/node/module-runner.js
+// ../../node_modules/.pnpm/vite@6.0.7_@types+node@18.19.59_jiti@2.4.2/node_modules/vite/dist/node/module-runner.js
 var VALID_ID_PREFIX = "/@id/";
 var NULL_BYTE_PLACEHOLDER = "__x00__";
 var SOURCEMAPPING_URL = "sourceMa";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "0.0.0-e62b097bb",
+  "version": "0.0.0-e7c7235fd",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -36,10 +36,10 @@
     "@hattip/adapter-node": "^0.0.49",
     "unenv": "npm:unenv-nightly@2.0.0-20241218-183400-5d6aec3",
     "ws": "^8.18.0",
-    "miniflare": "0.0.0-e62b097bb"
+    "miniflare": "0.0.0-e7c7235fd"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250204.0",
+    "@cloudflare/workers-types": "^4.20250121.0",
     "@types/node": "^22.10.1",
     "@types/ws": "^8.5.13",
     "magic-string": "^0.30.12",
@@ -47,8 +47,8 @@
     "typescript": "^5.7.2",
     "vite": "^6.0.7",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/workers-shared": "0.0.0-e62b097bb",
-    "wrangler": "0.0.0-e62b097bb"
+    "wrangler": "0.0.0-e7c7235fd",
+    "@cloudflare/workers-shared": "0.0.0-e7c7235fd"
   },
   "peerDependencies": {
     "vite": "^6.0.7",