wrangler 0.0.0-e33294b0 → 0.0.0-e33bea9b

package/src/dev/local.tsx

@@ -47,7 +47,6 @@ import type {
 } from "@miniflare/tre";
 import type { MiniflareOptions } from "miniflare";
 import type { ChildProcess } from "node:child_process";
-import type { RequestInit } from "undici";
 
 export interface LocalProps {
 	name: string | undefined;
@@ -71,7 +70,6 @@ export interface LocalProps {
 	localUpstream: string | undefined;
 	inspect: boolean;
 	onReady: ((ip: string, port: number) => void) | undefined;
-	logPrefix?: string;
 	enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
 	testScheduled?: boolean;
 	experimentalLocal: boolean | undefined;
@@ -122,7 +120,6 @@ function useLocalWorker({
 	localUpstream,
 	inspect,
 	onReady,
-	logPrefix,
 	enablePagesAssetsServiceBinding,
 	experimentalLocal,
 	accountId,
@@ -217,13 +214,12 @@ function useLocalWorker({
 				dataBlobBindings,
 				crons,
 				upstream,
-				logPrefix,
 				workerDefinitions,
 				enablePagesAssetsServiceBinding,
 			});
 
 			if (experimentalLocal) {
-				const log = await buildMiniflare3Logger(logPrefix);
+				const log = await buildMiniflare3Logger();
 				const mf3Options = await transformMf2OptionsToMf3Options({
 					miniflare2Options: options,
 					format,
@@ -232,6 +228,7 @@ function useLocalWorker({
 					enablePagesAssetsServiceBinding,
 					kvNamespaces: bindings?.kv_namespaces,
 					r2Buckets: bindings?.r2_buckets,
+					d1Databases: bindings?.d1_databases,
 					authenticatedAccountId: accountId,
 					kvRemote: experimentalLocalRemoteKv,
 					inspectorPort: runtimeInspectorPort,
@@ -438,7 +435,6 @@ function useLocalWorker({
 		localProtocol,
 		localUpstream,
 		inspect,
-		logPrefix,
 		onReady,
 		enablePagesAssetsServiceBinding,
 		experimentalLocal,
@@ -577,7 +573,6 @@ interface SetupMiniflareOptionsProps {
 	dataBlobBindings: Record<string, string>;
 	crons: Config["triggers"]["crons"];
 	upstream: string | undefined;
-	logPrefix: string | undefined;
 	workerDefinitions: WorkerRegistry | undefined;
 	enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
 }
@@ -609,7 +604,6 @@ export function setupMiniflareOptions({
 	dataBlobBindings,
 	crons,
 	upstream,
-	logPrefix,
 	workerDefinitions,
 	enablePagesAssetsServiceBinding,
 }: SetupMiniflareOptionsProps): {
@@ -722,7 +716,6 @@ export function setupMiniflareOptions({
 		crons,
 		upstream,
 		logLevel: logger.loggerLevel,
-		logOptions: logPrefix ? { prefix: logPrefix } : undefined,
 		enablePagesAssetsServiceBinding,
 	};
 	// The path to the Miniflare CLI assumes that this file is being run from
@@ -777,6 +770,7 @@ export interface SetupMiniflare3Options {
 	// we need actual namespace IDs to connect to.
 	kvNamespaces: CfKvNamespace[] | undefined;
 	r2Buckets: CfR2Bucket[] | undefined;
+	d1Databases: CfD1Database[] | undefined;
 
 	// Account ID to use for authenticated Cloudflare fetch. If true, prompt
 	// user for ID if multiple available.
@@ -788,18 +782,14 @@ export interface SetupMiniflare3Options {
 	inspectorPort: number;
 }
 
-export async function buildMiniflare3Logger(
-	logPrefix?: string
-): Promise<Miniflare3LogType> {
+export async function buildMiniflare3Logger(): Promise<Miniflare3LogType> {
 	const { Log, NoOpLog, LogLevel } = await getMiniflare3();
 
 	let level = logger.loggerLevel.toUpperCase() as Uppercase<LoggerLevel>;
 	if (level === "LOG") level = "INFO";
 	const logLevel = LogLevel[level];
 
-	return logLevel === LogLevel.NONE
-		? new NoOpLog()
-		: new Log(logLevel, { prefix: logPrefix });
+	return logLevel === LogLevel.NONE ? new NoOpLog() : new Log(logLevel);
 }
 
 export async function transformMf2OptionsToMf3Options({
@@ -810,6 +800,7 @@ export async function transformMf2OptionsToMf3Options({
 	enablePagesAssetsServiceBinding,
 	kvNamespaces,
 	r2Buckets,
+	d1Databases,
 	authenticatedAccountId,
 	kvRemote,
 	inspectorPort,
@@ -817,14 +808,14 @@ export async function transformMf2OptionsToMf3Options({
 	// Build authenticated Cloudflare API fetch function if required
 	let cloudflareFetch: CloudflareFetch | undefined;
 	if (kvRemote && authenticatedAccountId !== undefined) {
+		const { Response: Miniflare3Response } = await getMiniflare3();
 		const preferredAccountId =
 			authenticatedAccountId === true ? undefined : authenticatedAccountId;
 		const accountId = await requireAuth({ account_id: preferredAccountId });
-		cloudflareFetch = (resource, searchParams, init) => {
+		cloudflareFetch = async (resource, searchParams, init) => {
 			resource = `/accounts/${accountId}/${resource}`;
-			// Miniflare and Wrangler's `undici` versions may be slightly different,
-			// but their `RequestInit` types *should* be compatible
-			return performApiFetch(resource, init as RequestInit, searchParams);
+			const response = await performApiFetch(resource, init, searchParams);
+			return new Miniflare3Response(response.body, response);
 		};
 	}
 
@@ -837,6 +828,12 @@ export async function transformMf2OptionsToMf3Options({
 		r2Buckets: Object.fromEntries(
 			r2Buckets?.map(({ binding, bucket_name }) => [binding, bucket_name]) ?? []
 		),
+		d1Databases: Object.fromEntries(
+			d1Databases?.map(({ binding, database_id, preview_database_id }) => [
+				binding,
+				preview_database_id ?? database_id,
+			]) ?? []
+		),
 		inspectorPort,
 		verbose: true,
 		cloudflareFetch,
@@ -853,7 +850,7 @@ export async function transformMf2OptionsToMf3Options({
 		// relies on the fact that `require` is untyped.
 		//
 		// eslint-disable-next-line @typescript-eslint/no-var-requires
-		const generateASSETSBinding = require("../miniflare-cli/assets");
+		const generateASSETSBinding = require("../miniflare-cli/assets").default;
 		options.serviceBindings = {
 			...options.serviceBindings,
 			ASSETS: (await generateASSETSBinding({
@@ -919,5 +916,5 @@ export async function getMiniflare3(): Promise<
 	// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 	typeof import("@miniflare/tre")
 > {
-	return (miniflare3Module ??= await npxImport("@miniflare/tre@3.0.0-next.8"));
+	return (miniflare3Module ??= await npxImport("@miniflare/tre@3.0.0-next.12"));
 }

package/src/dev/start-server.ts

@@ -98,7 +98,8 @@ export async function startDevServer(
 			),
 			tsconfig: props.tsconfig,
 			minify: props.minify,
-			nodeCompat: props.nodeCompat,
+			legacyNodeCompat: props.legacyNodeCompat,
+			nodejsCompat: props.nodejsCompat,
 			define: props.define,
 			noBundle: props.noBundle,
 			assets: props.assetsConfig,
@@ -131,7 +132,6 @@ export async function startDevServer(
 				queueConsumers: props.queueConsumers,
 				localProtocol: props.localProtocol,
 				localUpstream: props.localUpstream,
-				logPrefix: props.logPrefix,
 				inspect: props.inspect,
 				onReady: props.onReady,
 				enablePagesAssetsServiceBinding: props.enablePagesAssetsServiceBinding,
@@ -210,7 +210,8 @@ async function runEsbuild({
 	serveAssetsFromWorker,
 	tsconfig,
 	minify,
-	nodeCompat,
+	legacyNodeCompat,
+	nodejsCompat,
 	define,
 	noBundle,
 	workerDefinitions,
@@ -233,7 +234,8 @@ async function runEsbuild({
 	serveAssetsFromWorker: boolean;
 	tsconfig: string | undefined;
 	minify: boolean | undefined;
-	nodeCompat: boolean | undefined;
+	legacyNodeCompat: boolean | undefined;
+	nodejsCompat: boolean | undefined;
 	noBundle: boolean;
 	workerDefinitions: WorkerRegistry;
 	firstPartyWorkerDevFacade: boolean | undefined;
@@ -266,7 +268,8 @@ async function runEsbuild({
 				rules,
 				tsconfig,
 				minify,
-				nodeCompat,
+				legacyNodeCompat,
+				nodejsCompat,
 				define,
 				checkFetch: true,
 				assets: assets && {
@@ -318,7 +321,6 @@ export async function startLocalServer({
 	localUpstream,
 	inspect,
 	onReady,
-	logPrefix,
 	enablePagesAssetsServiceBinding,
 	experimentalLocal,
 	accountId,
@@ -398,13 +400,12 @@ export async function startLocalServer({
 			dataBlobBindings,
 			crons,
 			upstream,
-			logPrefix,
 			workerDefinitions,
 			enablePagesAssetsServiceBinding,
 		});
 
 		if (experimentalLocal) {
-			const log = await buildMiniflare3Logger(logPrefix);
+			const log = await buildMiniflare3Logger();
 			const mf3Options = await transformMf2OptionsToMf3Options({
 				miniflare2Options: options,
 				format,
@@ -412,6 +413,7 @@ export async function startLocalServer({
 				log,
 				kvNamespaces: bindings?.kv_namespaces,
 				r2Buckets: bindings?.r2_buckets,
+				d1Databases: bindings?.d1_databases,
 				authenticatedAccountId: accountId,
 				kvRemote: experimentalLocalRemoteKv,
 				inspectorPort,

package/src/dev/use-esbuild.ts

@@ -30,7 +30,8 @@ export function useEsbuild({
 	serveAssetsFromWorker,
 	tsconfig,
 	minify,
-	nodeCompat,
+	legacyNodeCompat,
+	nodejsCompat,
 	betaD1Shims,
 	define,
 	noBundle,
@@ -54,7 +55,8 @@ export function useEsbuild({
 	serveAssetsFromWorker: boolean;
 	tsconfig: string | undefined;
 	minify: boolean | undefined;
-	nodeCompat: boolean | undefined;
+	legacyNodeCompat: boolean | undefined;
+	nodejsCompat: boolean | undefined;
 	betaD1Shims?: string[];
 	noBundle: boolean;
 	workerDefinitions: WorkerRegistry;
@@ -85,7 +87,7 @@ export function useEsbuild({
 		const watchMode: WatchMode = {
 			async onRebuild(error) {
 				if (error !== null) {
-					if (!nodeCompat) rewriteNodeCompatBuildFailure(error);
+					if (!legacyNodeCompat) rewriteNodeCompatBuildFailure(error);
 					logBuildFailure(error);
 					logger.error("Watch build failed:", error.message);
 				} else {
@@ -121,7 +123,8 @@ export function useEsbuild({
 						watch: watchMode,
 						tsconfig,
 						minify,
-						nodeCompat,
+						legacyNodeCompat,
+						nodejsCompat,
 						betaD1Shims,
 						doBindings: durableObjects.bindings,
 						define,
@@ -188,7 +191,8 @@ export function useEsbuild({
 		exit,
 		noBundle,
 		minify,
-		nodeCompat,
+		legacyNodeCompat,
+		nodejsCompat,
 		define,
 		assets,
 		services,

package/src/dev/validate-dev-props.ts

@@ -28,4 +28,13 @@ export function validateDevProps(props: DevProps) {
 			"You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml"
 		);
 	}
+
+	if (
+		props.compatibilityFlags?.includes("nodejs_compat") &&
+		props.legacyNodeCompat
+	) {
+		throw new Error(
+			"You cannot use the `nodejs_compat` compatibility flag in conjunction with the legacy `--node-compat` flag. If you want to use the new runtime Node.js compatibility features, please remove the `--node-compat` argument from your CLI command or your config file."
+		);
+	}
 }

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,
@@ -882,7 +893,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

@@ -151,8 +151,7 @@ export default async function guessWorkerFormat(
 		absWorkingDir: entryWorkingDirectory,
 		metafile: true,
 		bundle: false,
-		format: "esm",
-		target: "es2020",
+		target: "es2022",
 		write: false,
 		loader: {
 			".js": "jsx",

package/src/index.ts

@@ -567,7 +567,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,
 			};

package/src/init.ts

@@ -964,6 +964,7 @@ async function getWorkerConfig(
 					if (!(binding as any)?.type) break;
 					configObj.unsafe = {
 						bindings: [...(configObj.unsafe?.bindings ?? []), binding],
+						metadata: configObj.unsafe?.metadata ?? undefined,
 					};
 				}
 			}

package/src/inspect.ts

@@ -151,6 +151,18 @@ export default function useInspector(props: InspectorProps) {
 			);
 			ws.close(1013, "Too many clients; only one can be connected at a time");
 		} else {
+			// Since Wrangler proxies the inspector, reloading Chrome DevTools won't trigger debugger initialisation events (because it's connecting to an extant session).
+			// This sends a `Debugger.disable` message to the remote when a new WebSocket connection is initialised,
+			// with the assumption that the new connection will shortly send a `Debugger.enable` event and trigger re-initialisation.
+			// The key initialisation messages that are needed are the `Debugger.scriptParsed events`.
+			remoteWebSocket?.send(
+				JSON.stringify({
+					// This number is arbitrary, and is chosen to be high so as not to conflict with messages that DevTools might actually send.
+					// For completeness, these options don't work: 0, -1, or Number.MAX_SAFE_INTEGER
+					id: 100_000_000,
+					method: "Debugger.disable",
+				})
+			);
 			// As promised, save the created websocket in a state hook
 			setLocalWebSocket(ws);
 
@@ -733,7 +745,7 @@ function logConsoleMessage(evt: Protocol.Runtime.ConsoleAPICalledEvent): void {
  * Opens the chrome debugger
  */
 export const openInspector = async (inspectorPort: number) => {
-	const url = `https://built-devtools.pages.dev/js_app?experiments=true&v8only=true&ws=localhost:${inspectorPort}/ws`;
+	const url = `https://devtools.devprod.cloudflare.dev/js_app?theme=systemPreferred&ws=localhost:${inspectorPort}/ws`;
 	const errorMessage =
 		"Failed to open inspector.\nInspector depends on having a Chromium-based browser installed, maybe you need to install one?";
 
@@ -759,6 +771,9 @@ export const openInspector = async (inspectorPort: number) => {
 			{
 				name: open.apps.edge,
 			},
+			{
+				name: open.apps.firefox,
+			},
 		],
 	});
 	childProcess.on("error", () => {

package/src/miniflare-cli/assets.ts

@@ -12,9 +12,10 @@ import type {
 	ParsedHeaders,
 } from "@cloudflare/pages-shared/metadata-generator/types";
 import type {
-	RequestInfo as TreRequestInfo,
-	RequestInit as TreRequestInit,
-} from "@miniflare/tre";
+	Request as MiniflareRequest,
+	RequestInfo as MiniflareRequestInfo,
+	RequestInit as MiniflareRequestInit,
+} from "@miniflare/core";
 
 interface Logger {
 	log: (message: string) => void;
@@ -39,7 +40,7 @@ export default async function generateASSETSBinding(options: Options) {
 		? await import("@miniflare/tre")
 		: await import("@miniflare/core");
 
-	const Request = miniflare.Request;
+	const Request = miniflare.Request as typeof MiniflareRequest;
 	const Response = miniflare.Response;
 	// WebSockets won't work with `--experimental-local` until we expose something like `upgradingFetch` from `@miniflare/tre`.
 	const fetch = (
@@ -108,7 +109,7 @@ async function generateAssetsFetch(
 	const miniflare = tre
 		? await import("@miniflare/tre")
 		: await import("@miniflare/core");
-	const Request = miniflare.Request;
+	const Request = miniflare.Request as typeof MiniflareRequest;
 
 	const { generateHandler, parseQualityWeightedList } = await import(
 		"@cloudflare/pages-shared/asset-server/handler"
@@ -237,10 +238,10 @@ async function generateAssetsFetch(
 		});
 	};
 
-	return (async (input: TreRequestInfo, init?: TreRequestInit) => {
+	return async (input: MiniflareRequestInfo, init?: MiniflareRequestInit) => {
 		const request = new Request(input, init);
 		return await generateResponse(request as unknown as Request);
-	}) as typeof fetch;
+	};
 }
 
 const invalidAssetsFetch: typeof fetch = () => {

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));