wrangler 2.1.0 → 2.1.1

package/src/publish.ts

@@ -220,21 +220,29 @@ export default async function publish(props: Props): Promise<void> {
 	// TODO: warn if git/hg has uncommitted changes
 	const { config, accountId, name } = props;
 	if (accountId && name) {
-		const serviceMetaData = await fetchResult(
-			`/accounts/${accountId}/workers/services/${name}`
-		);
-		const { default_environment } = serviceMetaData as {
-			default_environment: {
-				script: { last_deployed_from: "dash" | "wrangler" | "api" };
+		try {
+			const serviceMetaData = await fetchResult(
+				`/accounts/${accountId}/workers/services/${name}`
+			);
+			const { default_environment } = serviceMetaData as {
+				default_environment: {
+					script: { last_deployed_from: "dash" | "wrangler" | "api" };
+				};
 			};
-		};
 
-		if (
-			(await fromDashMessagePrompt(
-				default_environment.script.last_deployed_from
-			)) === false
-		)
-			return;
+			if (
+				(await fromDashMessagePrompt(
+					default_environment.script.last_deployed_from
+				)) === false
+			)
+				return;
+		} catch (e) {
+			// code: 10090, message: workers.api.error.service_not_found
+			// is thrown from the above fetchResult on the first publish of a Worker
+			if ((e as { code?: number }).code !== 10090) {
+				logger.error(e);
+			}
+		}
 	}
 
 	if (!(props.compatibilityDate || config.compatibility_date)) {

package/wrangler-dist/cli.js

@@ -94180,6 +94180,7 @@ var require_get_intrinsic = __commonJS({
     var $spliceApply = bind.call(Function.apply, Array.prototype.splice);
     var $replace = bind.call(Function.call, String.prototype.replace);
     var $strSlice = bind.call(Function.call, String.prototype.slice);
+    var $exec = bind.call(Function.call, RegExp.prototype.exec);
     var rePropName = /[^%.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|%$))/g;
     var reEscapeChar = /\\(\\)?/g;
     var stringToPath = function stringToPath2(string) {
@@ -94226,6 +94227,9 @@ var require_get_intrinsic = __commonJS({
       if (arguments.length > 1 && typeof allowMissing !== "boolean") {
         throw new $TypeError('"allowMissing" argument must be a boolean');
       }
+      if ($exec(/^%?[^%]*%?$/g, name) === null) {
+        throw new $SyntaxError("`%` may not be present anywhere but at the beginning and end of the intrinsic name");
+      }
       var parts = stringToPath(name);
       var intrinsicBaseName = parts.length > 0 ? parts[0] : "";
       var intrinsic = getBaseIntrinsic("%" + intrinsicBaseName + "%", allowMissing);
@@ -94406,8 +94410,9 @@ var require_object_inspect = __commonJS({
       }
       return $replace.call(str, sepRegex, "$&_");
     }
-    var inspectCustom = require_util_inspect().custom;
-    var inspectSymbol = inspectCustom && isSymbol(inspectCustom) ? inspectCustom : null;
+    var utilInspect2 = require_util_inspect();
+    var inspectCustom = utilInspect2.custom;
+    var inspectSymbol = isSymbol(inspectCustom) ? inspectCustom : null;
     module2.exports = function inspect_(obj, options, depth, seen) {
       var opts = options || {};
       if (has(opts, "quoteStyle") && (opts.quoteStyle !== "single" && opts.quoteStyle !== "double")) {
@@ -94479,7 +94484,7 @@ var require_object_inspect = __commonJS({
         }
         return inspect_(value, opts, depth + 1, seen);
       }
-      if (typeof obj === "function") {
+      if (typeof obj === "function" && !isRegExp(obj)) {
         var name = nameOf(obj);
         var keys = arrObjKeys(obj, inspect2);
         return "[Function" + (name ? ": " + name : " (anonymous)") + "]" + (keys.length > 0 ? " { " + $join.call(keys, ", ") + " }" : "");
@@ -94513,7 +94518,7 @@ var require_object_inspect = __commonJS({
       }
       if (isError(obj)) {
         var parts = arrObjKeys(obj, inspect2);
-        if ("cause" in obj && !isEnumerable.call(obj, "cause")) {
+        if (!("cause" in Error.prototype) && "cause" in obj && !isEnumerable.call(obj, "cause")) {
           return "{ [" + String(obj) + "] " + $join.call($concat.call("[cause]: " + inspect2(obj.cause), parts), ", ") + " }";
         }
         if (parts.length === 0) {
@@ -94522,8 +94527,8 @@ var require_object_inspect = __commonJS({
         return "{ [" + String(obj) + "] " + $join.call(parts, ", ") + " }";
       }
       if (typeof obj === "object" && customInspect) {
-        if (inspectSymbol && typeof obj[inspectSymbol] === "function") {
-          return obj[inspectSymbol]();
+        if (inspectSymbol && typeof obj[inspectSymbol] === "function" && utilInspect2) {
+          return utilInspect2(obj, { depth: maxDepth - depth });
         } else if (customInspect !== "symbol" && typeof obj.inspect === "function") {
           return obj.inspect();
         }
@@ -113039,6 +113044,38 @@ var require_object_keys = __commonJS({
   }
 });
 
+// ../../node_modules/has-property-descriptors/index.js
+var require_has_property_descriptors = __commonJS({
+  "../../node_modules/has-property-descriptors/index.js"(exports2, module2) {
+    "use strict";
+    init_import_meta_url();
+    var GetIntrinsic = require_get_intrinsic();
+    var $defineProperty = GetIntrinsic("%Object.defineProperty%", true);
+    var hasPropertyDescriptors = function hasPropertyDescriptors2() {
+      if ($defineProperty) {
+        try {
+          $defineProperty({}, "a", { value: 1 });
+          return true;
+        } catch (e2) {
+          return false;
+        }
+      }
+      return false;
+    };
+    hasPropertyDescriptors.hasArrayLengthDefineBug = function hasArrayLengthDefineBug() {
+      if (!hasPropertyDescriptors()) {
+        return null;
+      }
+      try {
+        return $defineProperty([], "length", { value: 1 }).length !== 1;
+      } catch (e2) {
+        return true;
+      }
+    };
+    module2.exports = hasPropertyDescriptors;
+  }
+});
+
 // ../../node_modules/define-properties/index.js
 var require_define_properties = __commonJS({
   "../../node_modules/define-properties/index.js"(exports2, module2) {
@@ -113052,19 +113089,8 @@ var require_define_properties = __commonJS({
     var isFunction2 = function(fn) {
       return typeof fn === "function" && toStr.call(fn) === "[object Function]";
     };
-    var arePropertyDescriptorsSupported = function() {
-      var obj = {};
-      try {
-        origDefineProperty(obj, "x", { enumerable: false, value: obj });
-        for (var _2 in obj) {
-          return false;
-        }
-        return obj.x === obj;
-      } catch (e2) {
-        return false;
-      }
-    };
-    var supportsDescriptors = origDefineProperty && arePropertyDescriptorsSupported();
+    var hasPropertyDescriptors = require_has_property_descriptors()();
+    var supportsDescriptors = origDefineProperty && hasPropertyDescriptors;
     var defineProperty2 = function(object, name, value, predicate) {
       if (name in object && (!isFunction2(predicate) || !predicate())) {
         return;
@@ -138648,7 +138674,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.1.0";
+var version = "2.1.1";
 var package_default = {
   name: "wrangler",
   version,
@@ -138799,6 +138825,7 @@ var package_default = {
     "jest-fetch-mock": "^3.0.3",
     "jest-websocket-mock": "^2.3.0",
     mime: "^3.0.0",
+    msw: "^0.47.1",
     open: "^8.4.0",
     "p-queue": "^7.2.0",
     "pretty-bytes": "^6.0.0",
@@ -151529,14 +151556,20 @@ Update them to point to this script instead?`;
 async function publish(props) {
   const { config, accountId, name } = props;
   if (accountId && name) {
-    const serviceMetaData = await fetchResult(
-      `/accounts/${accountId}/workers/services/${name}`
-    );
-    const { default_environment } = serviceMetaData;
-    if (await fromDashMessagePrompt(
-      default_environment.script.last_deployed_from
-    ) === false)
-      return;
+    try {
+      const serviceMetaData = await fetchResult(
+        `/accounts/${accountId}/workers/services/${name}`
+      );
+      const { default_environment } = serviceMetaData;
+      if (await fromDashMessagePrompt(
+        default_environment.script.last_deployed_from
+      ) === false)
+        return;
+    } catch (e2) {
+      if (e2.code !== 10090) {
+        logger.error(e2);
+      }
+    }
   }
   if (!(props.compatibilityDate || config.compatibility_date)) {
     const compatibilityDateStr = `${new Date().getFullYear()}-${(new Date().getMonth() + 1 + "").padStart(2, "0")}-${(new Date().getDate() + "").padStart(2, "0")}`;
@@ -153741,6 +153774,77 @@ ${shouldDo}`);
       );
     }
   );
+  wrangler.command(
+    "secret:bulk <json>",
+    "\u{1F5C4}\uFE0F Bulk upload secrets for a Worker",
+    (yargs) => {
+      return yargs.positional("json", {
+        describe: `The JSON file of key-value pairs to upload, in form {"key": value, ...}`,
+        type: "string",
+        demandOption: "true"
+      }).option("name", {
+        describe: "Name of the Worker",
+        type: "string",
+        requiresArg: true
+      }).option("env", {
+        type: "string",
+        requiresArg: true,
+        describe: "Binds the secret to the Worker of the specific environment.",
+        alias: "e"
+      });
+    },
+    async (secretBulkArgs) => {
+      await printWranglerBanner();
+      const config = readConfig(
+        secretBulkArgs.config,
+        secretBulkArgs
+      );
+      const scriptName = getLegacyScriptName(secretBulkArgs, config);
+      if (!scriptName) {
+        throw new Error(
+          "Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with `--name <worker-name>`"
+        );
+      }
+      const accountId = await requireAuth(config);
+      logger.log(
+        `\u{1F300} Creating the secrets for the Worker "${scriptName}" ${secretBulkArgs.env && !isLegacyEnv(config) ? `(${secretBulkArgs.env})` : ""}`
+      );
+      const jsonFilePath = import_node_path32.default.resolve(secretBulkArgs.json);
+      const content = parseJSON(
+        readFileSync5(jsonFilePath),
+        jsonFilePath
+      );
+      for (const key2 in content) {
+        if (typeof content[key2] !== "string") {
+          throw new Error(
+            `The value for ${key2} in ${jsonFilePath} is not a string.`
+          );
+        }
+      }
+      const url3 = !secretBulkArgs.env || isLegacyEnv(config) ? `/accounts/${accountId}/workers/scripts/${scriptName}/secrets` : `/accounts/${accountId}/workers/services/${scriptName}/environments/${secretBulkArgs.env}/secrets`;
+      await Promise.allSettled(
+        Object.entries(content).map(async ([key2, value]) => {
+          return fetchResult(url3, {
+            method: "PUT",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+              name: key2,
+              text: value,
+              type: "secret_text"
+            })
+          }).then(() => {
+            logger.log(`\u2728 Successfully created secret for key: ${key2}`);
+          }).catch((e2) => {
+            logger.error(
+              `\u{1F6A8} Error uploading secret for key: ${key2}:
+										${e2.message}`
+            );
+          });
+        })
+      );
+      return logger.log("\u2728 Finished processing secrets JSON file");
+    }
+  );
   wrangler.command(
     "kv:namespace",
     "\u{1F5C2}\uFE0F  Interact with your Workers KV Namespaces",