wrangler 3.114.5 → 3.114.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.114.5",
+  "version": "3.114.6",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -137,8 +137,8 @@
     "xdg-app-paths": "^8.3.0",
     "xxhash-wasm": "^1.0.1",
     "yargs": "^17.7.2",
-    "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/cli": "1.1.1",
     "@cloudflare/workers-shared": "0.15.0",
     "@cloudflare/pages-shared": "0.13.16",
     "@cloudflare/workers-tsconfig": "0.0.0"

package/wrangler-dist/cli.js

@@ -81450,7 +81450,7 @@ var import_undici3 = __toESM(require_undici());
 
 // package.json
 var name = "wrangler";
-var version = "3.114.5";
+var version = "3.114.6";
 
 // src/environment-variables/misc-variables.ts
 init_import_meta_url();
@@ -85217,52 +85217,74 @@ function normalizeAndValidateConfig(rawConfig, configPath, userConfigPath, args)
     rawConfig,
     isDispatchNamespace
   );
+  const isRedirectedConfig = configPath && configPath !== userConfigPath;
+  const definedEnvironments = Object.keys(rawConfig.env ?? {});
+  if (isRedirectedConfig && definedEnvironments.length > 0) {
+    diagnostics.errors.push(
+      dedent`
+				Redirected configurations cannot include environments but the following have been found:\n${definedEnvironments.map((env6) => `	- ${env6}`).join("\n")}
+
+
+				Such configurations are generated by tools, meaning that one of the tools
+				your application is using is generating the incorrect configuration.
+				Report this issue to the tool's author so that this can be fixed there.
+				`
+    );
+  }
   const envName = args.env;
   (0, import_node_assert.default)(envName === void 0 || typeof envName === "string");
   let activeEnv = topLevelEnv;
   if (envName !== void 0) {
-    const envDiagnostics = new Diagnostics(
-      `"env.${envName}" environment configuration`
-    );
-    const rawEnv = rawConfig.env?.[envName];
-    if (rawEnv !== void 0) {
-      activeEnv = normalizeAndValidateEnvironment(
-        envDiagnostics,
-        configPath,
-        rawEnv,
-        isDispatchNamespace,
-        envName,
-        topLevelEnv,
-        isLegacyEnv2,
-        rawConfig
-      );
-      diagnostics.addChild(envDiagnostics);
-    } else if (!isPagesConfig(rawConfig)) {
-      activeEnv = normalizeAndValidateEnvironment(
-        envDiagnostics,
-        configPath,
-        topLevelEnv,
-        // in this case reuse the topLevelEnv to ensure that nonInherited fields are not removed
-        isDispatchNamespace,
-        envName,
-        topLevelEnv,
-        isLegacyEnv2,
-        rawConfig
-      );
-      const envNames = rawConfig.env ? `The available configured environment names are: ${JSON.stringify(
-        Object.keys(rawConfig.env)
-      )}
+    if (isRedirectedConfig) {
+      diagnostics.errors.push(dedent`
+				You have specified the environment "${envName}", but are using a redirected configuration, produced by a build tool such as Vite.
+				You need to set the environment in your build tool, rather than via Wrangler.
+				For example, if you are using Vite, refer to these docs: https://developers.cloudflare.com/workers/vite-plugin/reference/cloudflare-environments/
+			`);
+    } else {
+      const envDiagnostics = new Diagnostics(
+        `"env.${envName}" environment configuration`
+      );
+      const rawEnv = rawConfig.env?.[envName];
+      if (rawEnv !== void 0) {
+        activeEnv = normalizeAndValidateEnvironment(
+          envDiagnostics,
+          configPath,
+          rawEnv,
+          isDispatchNamespace,
+          envName,
+          topLevelEnv,
+          isLegacyEnv2,
+          rawConfig
+        );
+        diagnostics.addChild(envDiagnostics);
+      } else if (!isPagesConfig(rawConfig)) {
+        activeEnv = normalizeAndValidateEnvironment(
+          envDiagnostics,
+          configPath,
+          topLevelEnv,
+          // in this case reuse the topLevelEnv to ensure that nonInherited fields are not removed
+          isDispatchNamespace,
+          envName,
+          topLevelEnv,
+          isLegacyEnv2,
+          rawConfig
+        );
+        const envNames = rawConfig.env ? `The available configured environment names are: ${JSON.stringify(
+          Object.keys(rawConfig.env)
+        )}
 ` : "";
-      const message = `No environment found in configuration with name "${envName}".
+        const message = `No environment found in configuration with name "${envName}".
 Before using \`--env=${envName}\` there should be an equivalent environment section in the configuration.
 ${envNames}
 Consider adding an environment configuration section to the ${configFileName(configPath)} file:
 \`\`\`
 [env.` + envName + "]\n```\n";
-      if (envNames.length > 0) {
-        diagnostics.errors.push(message);
-      } else {
-        diagnostics.warnings.push(message);
+        if (envNames.length > 0) {
+          diagnostics.errors.push(message);
+        } else {
+          diagnostics.warnings.push(message);
+        }
       }
     }
   }
@@ -147390,7 +147412,7 @@ async function printMembershipInfo(user, accountFilter) {
   } catch (e7) {
     if (isAuthenticationError(e7)) {
       logger.log(
-        `\u{1F3A2} Unable to get membership roles. Make sure you have permissions to read the account.`
+        `\u{1F3A2} Unable to get membership roles. Make sure you have permissions to read the account. Are you missing the \`User->Memberships->Read\` permission?`
       );
       return;
     } else {