wrangler 2.1.0 → 2.1.3

package/src/dev.tsx

@@ -24,7 +24,6 @@ import {
 	isLegacyEnv,
 	DEFAULT_INSPECTOR_PORT,
 } from "./index";
-
 import type { Config } from "./config";
 import type { Route } from "./config/environment";
 import type { EnablePagesAssetsServiceBindingOptions } from "./miniflare-cli";
@@ -66,6 +65,8 @@ interface DevArgs {
 	define?: string[];
 	"node-compat"?: boolean;
 	"experimental-enable-local-persistence"?: boolean;
+	persist?: boolean;
+	"persist-to"?: string;
 	"live-reload"?: boolean;
 	onReady?: (ip: string, port: number) => void;
 	logLevel?: "none" | "error" | "log" | "warn" | "debug";
@@ -239,8 +240,22 @@ export function devOptions(yargs: Argv): Argv<DevArgs> {
 				type: "boolean",
 			})
 			.option("experimental-enable-local-persistence", {
-				describe: "Enable persistence for this session (only for local mode)",
+				describe:
+					"Enable persistence for local mode (deprecated, use --persist)",
 				type: "boolean",
+				deprecated: true,
+				hidden: true,
+			})
+			.option("persist", {
+				describe:
+					"Enable persistence for local mode, using default path: .wrangler/state",
+				type: "boolean",
+			})
+			.option("persist-to", {
+				describe:
+					"Specify directory to use for local persistence (implies --persist)",
+				type: "string",
+				requiresArg: true,
 			})
 			.option("live-reload", {
 				// TODO: Add back in once we have remote `--live-reload`
@@ -342,6 +357,7 @@ export async function startDev(args: StartDevOptions) {
 			getLocalPort,
 			getInspectorPort,
 			cliDefines,
+			localPersistencePath,
 		} = await validateDevServerSettings(args, config);
 
 		await metrics.sendMetricsEvent(
@@ -382,9 +398,7 @@ export async function startDev(args: StartDevOptions) {
 					upstreamProtocol={upstreamProtocol}
 					localProtocol={args.localProtocol || configParam.dev.local_protocol}
 					localUpstream={args["local-upstream"] || host}
-					enableLocalPersistence={
-						args.experimentalEnableLocalPersistence || false
-					}
+					localPersistencePath={localPersistencePath}
 					liveReload={args.liveReload || false}
 					accountId={configParam.account_id || getAccountFromCache()?.id}
 					assetPaths={assetPaths}
@@ -457,6 +471,7 @@ export async function startApiDev(args: StartDevOptions) {
 		getLocalPort,
 		getInspectorPort,
 		cliDefines,
+		localPersistencePath,
 	} = await validateDevServerSettings(args, config);
 
 	await metrics.sendMetricsEvent(
@@ -493,7 +508,7 @@ export async function startApiDev(args: StartDevOptions) {
 			upstreamProtocol: upstreamProtocol,
 			localProtocol: args.localProtocol || configParam.dev.local_protocol,
 			localUpstream: args["local-upstream"] || host,
-			enableLocalPersistence: args.experimentalEnableLocalPersistence || false,
+			localPersistencePath: localPersistencePath,
 			liveReload: args.liveReload || false,
 			accountId: configParam.account_id || getAccountFromCache()?.id,
 			assetPaths: assetPaths,
@@ -670,6 +685,23 @@ async function validateDevServerSettings(
 		);
 	}
 
+	if (args.experimentalEnableLocalPersistence) {
+		logger.warn(
+			`--experimental-enable-local-persistence is deprecated.\n` +
+				`Move any existing data to .wrangler/state and use --persist, or\n` +
+				`use --persist-to=./wrangler-local-state to keep using the old path.`
+		);
+	}
+
+	const localPersistencePath = args.persistTo
+		? // If path specified, always treat it as relative to cwd()
+		  path.resolve(process.cwd(), args.persistTo)
+		: args.persist
+		? // If just flagged on, treat it as relative to wrangler.toml,
+		  // if one can be found, otherwise cwd()
+		  path.resolve(config.configPath || process.cwd(), ".wrangler/state")
+		: null;
+
 	const cliDefines =
 		args.define?.reduce<Record<string, string>>((collectDefines, d) => {
 			const [key, ...value] = d.split(":");
@@ -687,6 +719,7 @@ async function validateDevServerSettings(
 		host,
 		routes,
 		cliDefines,
+		localPersistencePath,
 	};
 }
 

package/src/dialogs.tsx

@@ -4,7 +4,11 @@ import SelectInput from "ink-select-input";
 import TextInput from "ink-text-input";
 import * as React from "react";
 import { useState } from "react";
+
+import { CI } from "./is-ci";
+import isInteractive from "./is-interactive";
 import { logger } from "./logger";
+
 type ConfirmProps = {
 	text: string;
 	onConfirm: (answer: boolean) => void;
@@ -135,13 +139,16 @@ export function select(
 }
 
 export async function fromDashMessagePrompt(
-	deploySource: string
+	deploySource: "dash" | "wrangler" | "api"
 ): Promise<boolean | void> {
 	if (deploySource === "dash") {
 		logger.warn(
 			`You are about to publish a Workers Service that was last published via the Cloudflare Dashboard.
 		Edits that have been made via the dashboard will be overridden by your local code and config.`
 		);
+
+		if (!isInteractive() || CI.isCI()) return true;
+
 		return await confirm("Would you like to continue?");
 	}
 }

package/src/index.tsx

@@ -1163,6 +1163,96 @@ function createCLIParser(argv: string[]) {
 		}
 	);
 
+	wrangler.command(
+		"secret:bulk <json>",
+		"🗄️ 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 as ConfigPath,
+				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(
+				`🌀 Creating the secrets for the Worker "${scriptName}" ${
+					secretBulkArgs.env && !isLegacyEnv(config)
+						? `(${secretBulkArgs.env})`
+						: ""
+				}`
+			);
+			const jsonFilePath = path.resolve(secretBulkArgs.json);
+			const content = parseJSON<Record<string, string>>(
+				readFileSync(jsonFilePath),
+				jsonFilePath
+			);
+			for (const key in content) {
+				if (typeof content[key] !== "string") {
+					throw new Error(
+						`The value for ${key} in ${jsonFilePath} is not a string.`
+					);
+				}
+			}
+
+			const url =
+				!secretBulkArgs.env || isLegacyEnv(config)
+					? `/accounts/${accountId}/workers/scripts/${scriptName}/secrets`
+					: `/accounts/${accountId}/workers/services/${scriptName}/environments/${secretBulkArgs.env}/secrets`;
+			// Until we have a bulk route for secrets, we need to make a request for each key/value pair
+			await Promise.allSettled(
+				Object.entries(content).map(async ([key, value]) => {
+					return fetchResult(url, {
+						method: "PUT",
+						headers: { "Content-Type": "application/json" },
+						body: JSON.stringify({
+							name: key,
+							text: value,
+							type: "secret_text",
+						}),
+					})
+						.then(() => {
+							logger.log(`✨ Successfully created secret for key: ${key}`);
+						})
+						.catch((e) => {
+							logger.error(
+								`🚨 Error uploading secret for key: ${key}:
+										${e.message}`
+							);
+						});
+				})
+			);
+			return logger.log("✨ Finished processing secrets JSON file");
+		}
+	);
+
 	// kv
 	// :namespace
 	wrangler.command(

package/src/miniflare-cli/assets.ts

@@ -100,7 +100,7 @@ async function generateAssetsFetch(
 	let metadata = createMetadataObject({
 		redirects,
 		headers,
-		logger: log.warn,
+		logger: log.warn.bind(log),
 	});
 
 	watch([headersFile, redirectsFile], { persistent: true }).on(

package/src/pages/dev.tsx

@@ -116,9 +116,22 @@ export function Options(yargs: Argv) {
 				choices: ["http", "https"] as const,
 			},
 			"experimental-enable-local-persistence": {
+				describe:
+					"Enable persistence for local mode (deprecated, use --persist)",
 				type: "boolean",
-				default: false,
-				describe: "Enable persistence for this session (only for local mode)",
+				deprecated: true,
+				hidden: true,
+			},
+			persist: {
+				describe:
+					"Enable persistence for local mode, using default path: .wrangler/state",
+				type: "boolean",
+			},
+			"persist-to": {
+				describe:
+					"Specify directory to use for local persistence (implies --persist)",
+				type: "string",
+				requiresArg: true,
 			},
 			"node-compat": {
 				describe: "Enable node.js compatibility",
@@ -151,7 +164,9 @@ export const Handler = async ({
 	r2: r2s = [],
 	"live-reload": liveReload,
 	"local-protocol": localProtocol,
-	"experimental-enable-local-persistence": experimentalEnableLocalPersistence,
+	experimentalEnableLocalPersistence,
+	persist,
+	persistTo,
 	"node-compat": nodeCompat,
 	config: config,
 	_: [_pages, _dev, ...remaining],
@@ -189,6 +204,14 @@ export const Handler = async ({
 		directory = resolve(directory);
 	}
 
+	if (experimentalEnableLocalPersistence) {
+		logger.warn(
+			`--experimental-enable-local-persistence is deprecated.\n` +
+				`Move any existing data to .wrangler/state and use --persist, or\n` +
+				`use --persist-to=./wrangler-local-state to keep using the old path.`
+		);
+	}
+
 	let scriptReadyResolve: () => void;
 	const scriptReadyPromise = new Promise<void>(
 		(promiseResolve) => (scriptReadyResolve = promiseResolve)
@@ -358,7 +381,8 @@ export const Handler = async ({
 				directory,
 			},
 			forceLocal: true,
-			experimentalEnableLocalPersistence,
+			persist,
+			persistTo,
 			showInteractiveDevSession: undefined,
 			inspect: true,
 			logLevel: "error",

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.d.ts

@@ -52,7 +52,8 @@ declare interface DevOptions {
     nodeCompat?: boolean;
     compatibilityDate?: string;
     compatibilityFlags?: string[];
-    experimentalEnableLocalPersistence?: boolean;
+    persist?: boolean;
+    persistTo?: string;
     liveReload?: boolean;
     watch?: boolean;
     vars?: {