wrangler 0.0.0-e6e1daba → 0.0.0-e7cf0caa

package/src/dev.tsx

@@ -229,7 +229,7 @@ export function devOptions(yargs: CommonYargsArgv) {
 				type: "boolean",
 			})
 			.option("node-compat", {
-				describe: "Enable node.js compatibility",
+				describe: "Enable Node.js compatibility",
 				type: "boolean",
 			})
 			.option("experimental-enable-local-persistence", {
@@ -344,7 +344,6 @@ type StartDevOptions = DevArguments &
 		disableDevRegistry?: boolean;
 		enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
 		onReady?: (ip: string, port: number) => void;
-		logPrefix?: string;
 		showInteractiveDevSession?: boolean;
 	};
 
@@ -388,7 +387,8 @@ export async function startDev(args: StartDevOptions) {
 
 		const {
 			entry,
-			nodeCompat,
+			legacyNodeCompat,
+			nodejsCompat,
 			upstreamProtocol,
 			zoneId,
 			host,
@@ -427,7 +427,8 @@ export async function startDev(args: StartDevOptions) {
 					rules={getRules(configParam)}
 					legacyEnv={isLegacyEnv(configParam)}
 					minify={args.minify ?? configParam.minify}
-					nodeCompat={nodeCompat}
+					legacyNodeCompat={legacyNodeCompat}
+					nodejsCompat={nodejsCompat}
 					build={configParam.build || {}}
 					define={{ ...configParam.define, ...cliDefines }}
 					initialMode={
@@ -465,7 +466,6 @@ export async function startDev(args: StartDevOptions) {
 					bindings={bindings}
 					crons={configParam.triggers.crons}
 					queueConsumers={configParam.queues.consumers}
-					logPrefix={args.logPrefix}
 					onReady={args.onReady}
 					inspect={args.inspect ?? true}
 					showInteractiveDevSession={args.showInteractiveDevSession}
@@ -523,7 +523,8 @@ export async function startApiDev(args: StartDevOptions) {
 
 	const {
 		entry,
-		nodeCompat,
+		legacyNodeCompat,
+		nodejsCompat,
 		upstreamProtocol,
 		zoneId,
 		host,
@@ -562,7 +563,8 @@ export async function startApiDev(args: StartDevOptions) {
 			rules: getRules(configParam),
 			legacyEnv: isLegacyEnv(configParam),
 			minify: args.minify ?? configParam.minify,
-			nodeCompat: nodeCompat,
+			legacyNodeCompat,
+			nodejsCompat,
 			build: configParam.build || {},
 			define: { ...config.define, ...cliDefines },
 			initialMode: args.local ? "local" : "remote",
@@ -596,7 +598,6 @@ export async function startApiDev(args: StartDevOptions) {
 			bindings: bindings,
 			crons: configParam.triggers.crons,
 			queueConsumers: configParam.queues.consumers,
-			logPrefix: args.logPrefix,
 			onReady: args.onReady,
 			inspect: args.inspect ?? true,
 			showInteractiveDevSession: args.showInteractiveDevSession,
@@ -742,10 +743,19 @@ async function validateDevServerSettings(
 				"https://github.com/cloudflare/workers-sdk/issues/583."
 		);
 	}
-	const nodeCompat = args.nodeCompat ?? config.node_compat;
-	if (nodeCompat) {
+	const legacyNodeCompat = args.nodeCompat ?? config.node_compat;
+	if (legacyNodeCompat) {
 		logger.warn(
-			"Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details."
+			"Enabling Node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details."
+		);
+	}
+
+	const compatibilityFlags =
+		args.compatibilityFlags ?? config.compatibility_flags;
+	const nodejsCompat = compatibilityFlags?.includes("nodejs_compat");
+	if (legacyNodeCompat && nodejsCompat) {
+		throw new Error(
+			"The `nodejs_compat` compatibility flag cannot be used in conjunction with the legacy `--node-compat` flag. If you want to use the Workers runtime Node.js compatibility features, please remove the `--node-compat` argument from your CLI command or `node_compat = true` from your config file."
 		);
 	}
 
@@ -768,7 +778,8 @@ async function validateDevServerSettings(
 	return {
 		entry,
 		upstreamProtocol,
-		nodeCompat,
+		legacyNodeCompat,
+		nodejsCompat,
 		getLocalPort,
 		getInspectorPort,
 		zoneId,
@@ -841,6 +852,7 @@ function getBindings(
 			),
 			...(args.kv || []),
 		],
+		send_email: configParam.send_email,
 		// Use a copy of combinedVars since we're modifying it later
 		vars: {
 			...getVarsForDev(configParam, env),
@@ -882,7 +894,10 @@ function getBindings(
 		mtls_certificates: configParam.mtls_certificates,
 		services: configParam.services,
 		analytics_engine_datasets: configParam.analytics_engine_datasets,
-		unsafe: configParam.unsafe?.bindings,
+		unsafe: {
+			bindings: configParam.unsafe.bindings,
+			metadata: configParam.unsafe.metadata,
+		},
 		logfwdr: configParam.logfwdr,
 		d1_databases: identifyD1BindingsAsBeta([
 			...(configParam.d1_databases ?? []).map((d1Db) => {

package/src/entry.ts

@@ -3,6 +3,7 @@ import { existsSync, statSync } from "node:fs";
 import path from "node:path";
 import * as esbuild from "esbuild";
 import { execaCommand } from "execa";
+import { COMMON_ESBUILD_OPTIONS } from "./bundle";
 import { logger } from "./logger";
 import { getBasePath } from "./paths";
 import type { Config } from "./config";
@@ -15,7 +16,16 @@ import type { Metafile } from "esbuild";
  *
  * It consists not just of a `file`, but also of a `directory` that is used to resolve relative paths.
  */
-export type Entry = { file: string; directory: string; format: CfScriptFormat };
+export type Entry = {
+	/** A worker's entrypoint */
+	file: string;
+	/** A worker's directory. Usually where the wrangler.toml file is located */
+	directory: string;
+	/** Is this a module worker or a service worker? */
+	format: CfScriptFormat;
+	/** The directory that contains all of a `--no-bundle` worker's modules. Usually `${directory}/src`. Defaults to path.dirname(file) */
+	moduleRoot: string;
+};
 
 /**
  * Compute the entry-point for the Worker.
@@ -99,7 +109,12 @@ export async function getEntry(
 		);
 	}
 
-	return { file, directory, format };
+	return {
+		file,
+		directory,
+		format,
+		moduleRoot: config.base_dir ?? path.dirname(file),
+	};
 }
 
 export async function runCustomBuild(
@@ -147,17 +162,12 @@ export default async function guessWorkerFormat(
 	tsconfig?: string | undefined
 ): Promise<CfScriptFormat> {
 	const result = await esbuild.build({
+		...COMMON_ESBUILD_OPTIONS,
 		entryPoints: [entryFile],
 		absWorkingDir: entryWorkingDirectory,
 		metafile: true,
 		bundle: false,
-		target: "es2022",
 		write: false,
-		loader: {
-			".js": "jsx",
-			".mjs": "jsx",
-			".cjs": "jsx",
-		},
 		...(tsconfig && { tsconfig }),
 	});
 	// result.metafile is defined because of the `metafile: true` option above.

package/src/generate/index.ts

@@ -269,8 +269,8 @@ function parseTemplatePath(templatePath: string): {
 	if (!templatePath.includes("/")) {
 		// template is a cloudflare canonical template, it doesn't include a slash in the name
 		return {
-			remote: "https://github.com/cloudflare/templates.git",
-			subdirectory: templatePath,
+			remote: "https://github.com/cloudflare/workers-sdk.git",
+			subdirectory: `templates/${templatePath}`,
 		};
 	}
 

package/src/index.ts

@@ -9,7 +9,12 @@ import { isBuildFailure } from "./bundle";
 import { loadDotEnv, readConfig } from "./config";
 import { d1 } from "./d1";
 import { deleteHandler, deleteOptions } from "./delete";
-import { deployments } from "./deployments";
+import {
+	deployments,
+	commonDeploymentCMDSetup,
+	rollbackDeployment,
+	viewDeployment,
+} from "./deployments";
 import {
 	buildHandler,
 	buildOptions,
@@ -41,13 +46,7 @@ import { secret, secretBulkHandler, secretBulkOptions } from "./secret";
 import { tailOptions, tailHandler } from "./tail";
 import { generateTypes } from "./type-generation";
 import { updateCheck } from "./update-check";
-import {
-	listScopes,
-	login,
-	logout,
-	requireAuth,
-	validateScopeKeys,
-} from "./user";
+import { listScopes, login, logout, validateScopeKeys } from "./user";
 import { whoami } from "./whoami";
 
 import type { Config } from "./config";
@@ -567,7 +566,7 @@ export function createCLIParser(argv: string[]) {
 				analytics_engine_datasets: config.analytics_engine_datasets,
 				dispatch_namespaces: config.dispatch_namespaces,
 				logfwdr: config.logfwdr,
-				unsafe: { bindings: config.unsafe?.bindings },
+				unsafe: config.unsafe,
 				rules: config.rules,
 				queues: config.queues,
 			};
@@ -581,27 +580,81 @@ export function createCLIParser(argv: string[]) {
 		"🚧`wrangler deployments` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose";
 	wrangler.command(
 		"deployments",
-		"🚢 Displays the 10 most recent deployments for a worker",
+		"🚢 List and view details for deployments",
 		(yargs) =>
 			yargs
 				.option("name", {
 					describe: "The name of your worker",
 					type: "string",
 				})
-				.epilogue(deploymentsWarning),
-		async (deploymentsYargs) => {
-			await printWranglerBanner();
-			const config = readConfig(deploymentsYargs.config, deploymentsYargs);
-			const accountId = await requireAuth(config);
-			const scriptName = getScriptName(
-				{ name: deploymentsYargs.name, env: undefined },
-				config
-			);
-
-			logger.log(`${deploymentsWarning}\n`);
-			await deployments(accountId, scriptName, config);
-		}
+				.command(
+					"list",
+					"🚢 Displays the 10 most recent deployments for a worker",
+					async (listYargs) => listYargs,
+					async (listYargs) => {
+						const { accountId, scriptName, config } =
+							await commonDeploymentCMDSetup(listYargs, deploymentsWarning);
+						await deployments(accountId, scriptName, config);
+					}
+				)
+				.command(
+					"view [deployment-id]",
+					"🔍 View a deployment",
+					async (viewYargs) =>
+						viewYargs.positional("deployment-id", {
+							describe: "The ID of the deployment you want to inspect",
+							type: "string",
+							demandOption: false,
+						}),
+					async (viewYargs) => {
+						const { accountId, scriptName, config } =
+							await commonDeploymentCMDSetup(viewYargs, deploymentsWarning);
+
+						await viewDeployment(
+							accountId,
+							scriptName,
+							config,
+							viewYargs.deploymentId
+						);
+					}
+				)
+				.command(subHelp)
+				.epilogue(deploymentsWarning)
 	);
+	const rollbackWarning =
+		"🚧`wrangler rollback` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose";
+	wrangler
+		.command(
+			"rollback [deployment-id]",
+			"🔙 Rollback a deployment",
+			(rollbackYargs) =>
+				rollbackYargs
+					.positional("deployment-id", {
+						describe: "The ID of the deployment to rollback to",
+						type: "string",
+						demandOption: false,
+					})
+					.option("message", {
+						alias: "m",
+						describe:
+							"Skip confirmation and message prompts, uses provided argument as message",
+						type: "string",
+						default: undefined,
+					}),
+			async (rollbackYargs) => {
+				const { accountId, scriptName, config } =
+					await commonDeploymentCMDSetup(rollbackYargs, rollbackWarning);
+
+				await rollbackDeployment(
+					accountId,
+					scriptName,
+					config,
+					rollbackYargs.deploymentId,
+					rollbackYargs.message
+				);
+			}
+		)
+		.epilogue(rollbackWarning);
 
 	// This set to false to allow overwrite of default behaviour
 	wrangler.version(false);

package/src/init.ts

@@ -19,7 +19,10 @@ import { CommandLineArgsError, printWranglerBanner } from "./index";
 
 import type { RawConfig } from "./config";
 import type { Route, SimpleRoute } from "./config/environment";
-import type { WorkerMetadata } from "./create-worker-upload-form";
+import type {
+	WorkerMetadata,
+	WorkerMetadataBinding,
+} from "./create-worker-upload-form";
 import type { PackageManager } from "./package-manager";
 import type { PackageJSON } from "./parse";
 import type {
@@ -838,139 +841,7 @@ async function getWorkerConfig(
 			);
 		});
 
-	const mappedBindings = bindings
-		.filter((binding) => (binding.type as string) !== "secret_text")
-		// Combine the same types into {[type]: [binding]}
-		.reduce((configObj, binding) => {
-			// Some types have different names in wrangler.toml
-			// I want the type safety of the binding being destructured after the case narrowing the union but type is unused
-
-			switch (binding.type) {
-				case "plain_text":
-					{
-						configObj.vars = {
-							...(configObj.vars ?? {}),
-							[binding.name]: binding.text,
-						};
-					}
-					break;
-				case "json":
-					{
-						configObj.vars = {
-							...(configObj.vars ?? {}),
-							name: binding.name,
-							json: binding.json,
-						};
-					}
-					break;
-				case "kv_namespace":
-					{
-						configObj.kv_namespaces = [
-							...(configObj.kv_namespaces ?? []),
-							{ id: binding.namespace_id, binding: binding.name },
-						];
-					}
-					break;
-				case "durable_object_namespace":
-					{
-						configObj.durable_objects = {
-							bindings: [
-								...(configObj.durable_objects?.bindings ?? []),
-								{
-									name: binding.name,
-									class_name: binding.class_name,
-									script_name: binding.script_name,
-									environment: binding.environment,
-								},
-							],
-						};
-					}
-					break;
-				case "r2_bucket":
-					{
-						configObj.r2_buckets = [
-							...(configObj.r2_buckets ?? []),
-							{ binding: binding.name, bucket_name: binding.bucket_name },
-						];
-					}
-					break;
-				case "service":
-					{
-						configObj.services = [
-							...(configObj.services ?? []),
-							{
-								binding: binding.name,
-								service: binding.service,
-								environment: binding.environment,
-							},
-						];
-					}
-					break;
-				case "analytics_engine":
-					{
-						configObj.analytics_engine_datasets = [
-							...(configObj.analytics_engine_datasets ?? []),
-							{ binding: binding.name, dataset: binding.dataset },
-						];
-					}
-					break;
-				case "dispatch_namespace":
-					{
-						configObj.dispatch_namespaces = [
-							...(configObj.dispatch_namespaces ?? []),
-							{ binding: binding.name, namespace: binding.namespace },
-						];
-					}
-					break;
-				case "logfwdr":
-					{
-						configObj.logfwdr = {
-							// TODO: Messaging about adding schema file path
-							schema: "",
-							bindings: [
-								...(configObj.logfwdr?.bindings ?? []),
-								{ name: binding.name, destination: binding.destination },
-							],
-						};
-					}
-					break;
-				case "wasm_module":
-					{
-						configObj.wasm_modules = {
-							...(configObj.wasm_modules ?? {}),
-							[binding.name]: binding.part,
-						};
-					}
-					break;
-				case "text_blob":
-					{
-						configObj.text_blobs = {
-							...(configObj.text_blobs ?? {}),
-							[binding.name]: binding.part,
-						};
-					}
-					break;
-				case "data_blob":
-					{
-						configObj.data_blobs = {
-							...(configObj.data_blobs ?? {}),
-							[binding.name]: binding.part,
-						};
-					}
-					break;
-				default: {
-					// If we don't know what the type is, its an unsafe binding
-					// eslint-disable-next-line @typescript-eslint/no-explicit-any
-					if (!(binding as any)?.type) break;
-					configObj.unsafe = {
-						bindings: [...(configObj.unsafe?.bindings ?? []), binding],
-					};
-				}
-			}
-
-			return configObj;
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		}, {} as RawConfig);
+	const mappedBindings = mapBindings(bindings);
 
 	const durableObjectClassNames = bindings
 		.filter((binding) => binding.type === "durable_object_namespace")
@@ -1020,3 +891,142 @@ async function getWorkerConfig(
 		...mappedBindings,
 	};
 }
+
+export function mapBindings(bindings: WorkerMetadataBinding[]): RawConfig {
+	return (
+		bindings
+			.filter((binding) => (binding.type as string) !== "secret_text")
+			// Combine the same types into {[type]: [binding]}
+			.reduce((configObj, binding) => {
+				// Some types have different names in wrangler.toml
+				// I want the type safety of the binding being destructured after the case narrowing the union but type is unused
+
+				switch (binding.type) {
+					case "plain_text":
+						{
+							configObj.vars = {
+								...(configObj.vars ?? {}),
+								[binding.name]: binding.text,
+							};
+						}
+						break;
+					case "json":
+						{
+							configObj.vars = {
+								...(configObj.vars ?? {}),
+								name: binding.name,
+								json: binding.json,
+							};
+						}
+						break;
+					case "kv_namespace":
+						{
+							configObj.kv_namespaces = [
+								...(configObj.kv_namespaces ?? []),
+								{ id: binding.namespace_id, binding: binding.name },
+							];
+						}
+						break;
+					case "durable_object_namespace":
+						{
+							configObj.durable_objects = {
+								bindings: [
+									...(configObj.durable_objects?.bindings ?? []),
+									{
+										name: binding.name,
+										class_name: binding.class_name,
+										script_name: binding.script_name,
+										environment: binding.environment,
+									},
+								],
+							};
+						}
+						break;
+					case "r2_bucket":
+						{
+							configObj.r2_buckets = [
+								...(configObj.r2_buckets ?? []),
+								{ binding: binding.name, bucket_name: binding.bucket_name },
+							];
+						}
+						break;
+					case "service":
+						{
+							configObj.services = [
+								...(configObj.services ?? []),
+								{
+									binding: binding.name,
+									service: binding.service,
+									environment: binding.environment,
+								},
+							];
+						}
+						break;
+					case "analytics_engine":
+						{
+							configObj.analytics_engine_datasets = [
+								...(configObj.analytics_engine_datasets ?? []),
+								{ binding: binding.name, dataset: binding.dataset },
+							];
+						}
+						break;
+					case "dispatch_namespace":
+						{
+							configObj.dispatch_namespaces = [
+								...(configObj.dispatch_namespaces ?? []),
+								{ binding: binding.name, namespace: binding.namespace },
+							];
+						}
+						break;
+					case "logfwdr":
+						{
+							configObj.logfwdr = {
+								// TODO: Messaging about adding schema file path
+								schema: "",
+								bindings: [
+									...(configObj.logfwdr?.bindings ?? []),
+									{ name: binding.name, destination: binding.destination },
+								],
+							};
+						}
+						break;
+					case "wasm_module":
+						{
+							configObj.wasm_modules = {
+								...(configObj.wasm_modules ?? {}),
+								[binding.name]: binding.part,
+							};
+						}
+						break;
+					case "text_blob":
+						{
+							configObj.text_blobs = {
+								...(configObj.text_blobs ?? {}),
+								[binding.name]: binding.part,
+							};
+						}
+						break;
+					case "data_blob":
+						{
+							configObj.data_blobs = {
+								...(configObj.data_blobs ?? {}),
+								[binding.name]: binding.part,
+							};
+						}
+						break;
+					default: {
+						// If we don't know what the type is, its an unsafe binding
+						// eslint-disable-next-line @typescript-eslint/no-explicit-any
+						if (!(binding as any)?.type) break;
+						configObj.unsafe = {
+							bindings: [...(configObj.unsafe?.bindings ?? []), binding],
+							metadata: configObj.unsafe?.metadata ?? undefined,
+						};
+					}
+				}
+
+				return configObj;
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			}, {} as RawConfig)
+	);
+}

package/src/logger.ts

@@ -26,15 +26,30 @@ const LOGGER_LEVEL_FORMAT_TYPE_MAP = {
 
 const getLogLevelFromEnv = getEnvironmentVariableFactory({
 	variableName: "WRANGLER_LOG",
-	defaultValue: () => "log",
 });
 
+function getLoggerLevel(): LoggerLevel {
+	const fromEnv = getLogLevelFromEnv()?.toLowerCase();
+	if (fromEnv !== undefined) {
+		if (fromEnv in LOGGER_LEVELS) return fromEnv as LoggerLevel;
+		const expected = Object.keys(LOGGER_LEVELS)
+			.map((level) => `"${level}"`)
+			.join(" | ");
+		console.warn(
+			`Unrecognised WRANGLER_LOG value ${JSON.stringify(
+				fromEnv
+			)}, expected ${expected}, defaulting to "log"...`
+		);
+	}
+	return "log";
+}
+
 export type TableRow<Keys extends string> = Record<Keys, string>;
 
-class Logger {
+export class Logger {
 	constructor() {}
 
-	loggerLevel: LoggerLevel = (getLogLevelFromEnv() as LoggerLevel) ?? "log";
+	loggerLevel = getLoggerLevel();
 	columns = process.stdout.columns;
 
 	debug = (...args: unknown[]) => this.doLog("debug", args);

package/src/metrics/send-event.ts

@@ -57,7 +57,8 @@ export type EventNames =
 	| "run dev (api)"
 	| "run pages dev"
 	| "view docs"
-	| "view deployments";
+	| "view deployments"
+	| "rollback deployments";
 
 /**
  * Send a metrics event, with no extra properties, to Cloudflare, if usage tracking is enabled.

package/src/miniflare-cli/index.ts

@@ -47,7 +47,7 @@ async function main() {
 	config.log =
 		logLevel === MiniflareLogLevel.NONE
 			? new MiniflareNoOpLog()
-			: new MiniflareLog(logLevel, config.logOptions);
+			: new MiniflareLog(logLevel);
 
 	if (logLevel === MiniflareLogLevel.DEBUG) {
 		console.log("MINIFLARE OPTIONS:\n", JSON.stringify(config, null, 2));