wrangler 2.8.0 → 2.8.1

package/src/config/environment.ts

@@ -261,6 +261,17 @@ interface EnvironmentInheritable {
 	logpush: boolean | undefined;
 }
 
+export type DurableObjectBindings = {
+	/** The name of the binding used to refer to the Durable Object */
+	name: string;
+	/** The exported class name of the Durable Object */
+	class_name: string;
+	/** The script where the Durable Object is defined (if it's external to this worker) */
+	script_name?: string;
+	/** The service environment of the script_name to bind to */
+	environment?: string;
+}[];
+
 /**
  * The `EnvironmentNonInheritable` interface declares all the configuration fields for an environment
  * that cannot be inherited from the top-level environment, and must be defined specifically.
@@ -303,16 +314,7 @@ interface EnvironmentNonInheritable {
 	 * @nonInheritable
 	 */
 	durable_objects: {
-		bindings: {
-			/** The name of the binding used to refer to the Durable Object */
-			name: string;
-			/** The exported class name of the Durable Object */
-			class_name: string;
-			/** The script where the Durable Object is defined (if it's external to this worker) */
-			script_name?: string;
-			/** The service environment of the script_name to bind to */
-			environment?: string;
-		}[];
+		bindings: DurableObjectBindings;
 	};
 
 	/**

package/src/d1/utils.ts

@@ -45,4 +45,4 @@ export const getDatabaseByNameOrBinding = async (
 
 export const d1BetaWarning = process.env.NO_D1_WARNING
 	? ""
-	: "🚧 D1 is currently in open alpha and is not recommended for production data and traffic.\nPlease report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose.\nTo request features, visit https://community.cloudflare.com/c/developers/d1.\nTo give feedback, visit https://discord.gg/cloudflaredev";
+	: "--------------------\n🚧 D1 is currently in open alpha and is not recommended for production data and traffic\n🚧 Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose\n🚧 To request features, visit https://community.cloudflare.com/c/developers/d1\n🚧 To give feedback, visit https://discord.gg/cloudflaredev\n--------------------\n";

package/src/deployments.ts

@@ -1,6 +1,8 @@
 import { URLSearchParams } from "url";
 import { fetchResult } from "./cfetch";
 import { logger } from "./logger";
+import * as metrics from "./metrics";
+import type { Config } from "./config";
 import type { ServiceMetadataRes } from "./init";
 
 export type DeploymentListRes = {
@@ -34,7 +36,8 @@ export type DeploymentListRes = {
 
 export async function deployments(
 	accountId: string,
-	scriptName: string | undefined
+	scriptName: string | undefined,
+	{ send_metrics: sendMetrics }: { send_metrics?: Config["send_metrics"] } = {}
 ) {
 	if (!scriptName) {
 		throw new Error(
@@ -42,6 +45,14 @@ export async function deployments(
 		);
 	}
 
+	await metrics.sendMetricsEvent(
+		"view deployments",
+		{ view: scriptName ? "single" : "all" },
+		{
+			sendMetrics,
+		}
+	);
+
 	const scriptMetadata = await fetchResult<ServiceMetadataRes>(
 		`/accounts/${accountId}/workers/services/${scriptName}`
 	);
@@ -66,17 +77,16 @@ Source: ${sourceStr(versions.metadata.source)}\n`
 	logger.log(...versionMessages);
 }
 
-// TODO Include emoji/icon for each source
 function sourceStr(source: string): string {
 	switch (source) {
 		case "api":
-			return "API";
+			return "📡 API";
 		case "dash":
-			return "Dashboard";
+			return "🖥️ Dashboard";
 		case "wrangler":
-			return "Wrangler";
+			return "🤠 Wrangler";
 		case "terraform":
-			return "Terraform";
+			return "🏗️ Terraform";
 		default:
 			return "Other";
 	}

package/src/dev/local.tsx

@@ -1,7 +1,7 @@
 import assert from "node:assert";
 import { fork } from "node:child_process";
 import { realpathSync } from "node:fs";
-import { readFile, writeFile } from "node:fs/promises";
+import { readFile } from "node:fs/promises";
 import path from "node:path";
 import chalk from "chalk";
 import getPort from "get-port";
@@ -165,15 +165,6 @@ function useLocalWorker({
 		async function startLocalWorker() {
 			if (!bundle || !format) return;
 
-			// In local mode, we want to copy all referenced modules into
-			// the output bundle directory before starting up
-			for (const module of bundle.modules) {
-				await writeFile(
-					path.join(path.dirname(bundle.path), module.name),
-					module.content
-				);
-			}
-
 			const scriptPath = realpathSync(bundle.path);
 
 			const upstream =

package/src/dev/start-server.ts

@@ -1,6 +1,5 @@
 import { fork } from "node:child_process";
 import { realpathSync } from "node:fs";
-import { writeFile } from "node:fs/promises";
 import * as path from "node:path";
 import * as util from "node:util";
 import onExit from "signal-exit";
@@ -27,6 +26,7 @@ import { startRemoteServer } from "./remote";
 import { validateDevProps } from "./validate-dev-props";
 
 import type { Config } from "../config";
+import type { DurableObjectBindings } from "../config/environment";
 import type { WorkerRegistry } from "../dev-registry";
 import type { Entry } from "../entry";
 import type { DevProps, DirectorySyncResult } from "./dev";
@@ -109,6 +109,7 @@ export async function startDevServer(
 			testScheduled: props.testScheduled,
 			local: props.local,
 			experimentalLocal: props.experimentalLocal,
+			doBindings: props.bindings.durable_objects?.bindings ?? [],
 		});
 
 		if (props.local) {
@@ -218,6 +219,7 @@ async function runEsbuild({
 	testScheduled,
 	local,
 	experimentalLocal,
+	doBindings,
 }: {
 	entry: Entry;
 	destination: string | undefined;
@@ -238,6 +240,7 @@ async function runEsbuild({
 	testScheduled?: boolean;
 	local: boolean;
 	experimentalLocal: boolean | undefined;
+	doBindings: DurableObjectBindings;
 }): Promise<EsbuildBundle | undefined> {
 	if (!destination) return;
 
@@ -279,6 +282,7 @@ async function runEsbuild({
 				testScheduled,
 				local,
 				experimentalLocal,
+				doBindings,
 		  });
 
 	return {
@@ -345,15 +349,6 @@ export async function startLocalServer({
 			);
 		}
 
-		// In local mode, we want to copy all referenced modules into
-		// the output bundle directory before starting up
-		for (const module of bundle.modules) {
-			await writeFile(
-				path.join(path.dirname(bundle.path), module.name),
-				module.content
-			);
-		}
-
 		const scriptPath = realpathSync(bundle.path);
 
 		const upstream =

package/src/dev/use-esbuild.ts

@@ -123,6 +123,7 @@ export function useEsbuild({
 						minify,
 						nodeCompat,
 						betaD1Shims,
+						doBindings: durableObjects.bindings,
 						define,
 						checkFetch: true,
 						assets: assets && {

package/src/entry.ts

@@ -6,6 +6,7 @@ import { execaCommand } from "execa";
 import { logger } from "./logger";
 import { getBasePath } from "./paths";
 import type { Config } from "./config";
+import type { DurableObjectBindings } from "./config/environment";
 import type { CfScriptFormat } from "./worker";
 import type { Metafile } from "esbuild";
 
@@ -236,8 +237,6 @@ export function fileExists(filePath: string): boolean {
 	return false;
 }
 
-type DurableObjectBindings = Config["durable_objects"]["bindings"];
-
 /**
  * Groups the durable object bindings into two lists:
  * those that are defined locally and those that refer to a durable object defined in another script.

package/src/index.ts

@@ -588,7 +588,7 @@ export function createCLIParser(argv: string[]) {
 			);
 
 			logger.log(`${deploymentsWarning}\n`);
-			await deployments(accountId, scriptName);
+			await deployments(accountId, scriptName, config);
 		}
 	);
 

package/src/metrics/send-event.ts

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

package/src/pages/build.ts

@@ -1,27 +1,19 @@
-import { writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { dirname, join, resolve } from "node:path";
+import { dirname } from "node:path";
 import { FatalError } from "../errors";
 import { logger } from "../logger";
 import * as metrics from "../metrics";
-import { toUrlPath } from "../paths";
+import { buildFunctions } from "./buildFunctions";
 import { isInPagesCI } from "./constants";
 import {
 	EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR,
 	FunctionsNoRoutesError,
 	getFunctionsNoRoutesWarning,
 } from "./errors";
-import { buildPlugin } from "./functions/buildPlugin";
-import { buildWorker } from "./functions/buildWorker";
-import { generateConfigFromFileTree } from "./functions/filepath-routing";
-import { writeRoutesModule } from "./functions/routes";
-import { convertRoutesToRoutesJSONSpec } from "./functions/routes-transformation";
-import { pagesBetaWarning, RUNNING_BUILDERS } from "./utils";
+import { pagesBetaWarning } from "./utils";
 import type { YargsOptionsToInterface } from "../yargs-types";
-import type { Config } from "./functions/routes";
 import type { Argv } from "yargs";
 
-type PagesBuildArgs = YargsOptionsToInterface<typeof Options>;
+export type PagesBuildArgs = YargsOptionsToInterface<typeof Options>;
 
 export function Options(yargs: Argv) {
 	return yargs
@@ -156,115 +148,3 @@ export const Handler = async ({
 	}
 	await metrics.sendMetricsEvent("build pages functions");
 };
-
-/**
- * Builds a Functions worker based on the functions directory, with filepath and handler based routing.
- * @throws FunctionsNoRoutesError when there are no routes found in the functions directory
- */
-export async function buildFunctions({
-	outfile,
-	outputConfigPath,
-	functionsDirectory,
-	minify = false,
-	sourcemap = false,
-	fallbackService = "ASSETS",
-	watch = false,
-	onEnd,
-	plugin = false,
-	buildOutputDirectory,
-	routesOutputPath,
-	nodeCompat,
-	local,
-	d1Databases,
-}: Partial<
-	Pick<
-		PagesBuildArgs,
-		| "outputConfigPath"
-		| "minify"
-		| "sourcemap"
-		| "fallbackService"
-		| "watch"
-		| "plugin"
-		| "buildOutputDirectory"
-		| "nodeCompat"
-	>
-> & {
-	functionsDirectory: string;
-	onEnd?: () => void;
-	outfile: Required<PagesBuildArgs>["outfile"];
-	routesOutputPath?: PagesBuildArgs["outputRoutesPath"];
-	local: boolean;
-	d1Databases?: string[];
-}) {
-	RUNNING_BUILDERS.forEach(
-		(runningBuilder) => runningBuilder.stop && runningBuilder.stop()
-	);
-
-	const routesModule = join(tmpdir(), `./functionsRoutes-${Math.random()}.mjs`);
-	const baseURL = toUrlPath("/");
-
-	const config: Config = await generateConfigFromFileTree({
-		baseDir: functionsDirectory,
-		baseURL,
-	});
-
-	if (!config.routes || config.routes.length === 0) {
-		throw new FunctionsNoRoutesError(
-			`Failed to find any routes while compiling Functions in: ${functionsDirectory}`
-		);
-	}
-
-	if (routesOutputPath) {
-		const routesJSON = convertRoutesToRoutesJSONSpec(config.routes);
-		writeFileSync(routesOutputPath, JSON.stringify(routesJSON, null, 2));
-	}
-
-	if (outputConfigPath) {
-		writeFileSync(
-			outputConfigPath,
-			JSON.stringify({ ...config, baseURL }, null, 2)
-		);
-	}
-
-	await writeRoutesModule({
-		config,
-		srcDir: functionsDirectory,
-		outfile: routesModule,
-	});
-
-	const absoluteFunctionsDirectory = resolve(functionsDirectory);
-
-	if (plugin) {
-		RUNNING_BUILDERS.push(
-			await buildPlugin({
-				routesModule,
-				outfile,
-				minify,
-				sourcemap,
-				watch,
-				nodeCompat,
-				functionsDirectory: absoluteFunctionsDirectory,
-				local,
-				betaD1Shims: d1Databases,
-				onEnd,
-			})
-		);
-	} else {
-		RUNNING_BUILDERS.push(
-			await buildWorker({
-				routesModule,
-				outfile,
-				minify,
-				sourcemap,
-				fallbackService,
-				watch,
-				functionsDirectory: absoluteFunctionsDirectory,
-				local,
-				betaD1Shims: d1Databases,
-				onEnd,
-				buildOutputDirectory,
-				nodeCompat,
-			})
-		);
-	}
-}

package/src/pages/buildFunctions.ts

@@ -0,0 +1,129 @@
+import { writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join, resolve } from "node:path";
+import { toUrlPath } from "../paths";
+import { FunctionsNoRoutesError } from "./errors";
+import { buildPlugin } from "./functions/buildPlugin";
+import { buildWorker } from "./functions/buildWorker";
+import { generateConfigFromFileTree } from "./functions/filepath-routing";
+import { writeRoutesModule } from "./functions/routes";
+import { convertRoutesToRoutesJSONSpec } from "./functions/routes-transformation";
+import { RUNNING_BUILDERS } from "./utils";
+import type { PagesBuildArgs } from "./build";
+import type { Config } from "./functions/routes";
+
+/**
+ * Builds a Functions worker based on the functions directory, with filepath and handler based routing.
+ * @throws FunctionsNoRoutesError when there are no routes found in the functions directory
+ */
+
+export async function buildFunctions({
+	outfile,
+	outputConfigPath,
+	functionsDirectory,
+	minify = false,
+	sourcemap = false,
+	fallbackService = "ASSETS",
+	watch = false,
+	onEnd,
+	plugin = false,
+	buildOutputDirectory,
+	routesOutputPath,
+	nodeCompat,
+	local,
+	d1Databases,
+	experimentalWorkerBundle = false,
+}: Partial<
+	Pick<
+		PagesBuildArgs,
+		| "outputConfigPath"
+		| "minify"
+		| "sourcemap"
+		| "fallbackService"
+		| "watch"
+		| "plugin"
+		| "buildOutputDirectory"
+		| "nodeCompat"
+	>
+> & {
+	functionsDirectory: string;
+	onEnd?: () => void;
+	outfile: Required<PagesBuildArgs>["outfile"];
+	routesOutputPath?: PagesBuildArgs["outputRoutesPath"];
+	local: boolean;
+	d1Databases?: string[];
+	experimentalWorkerBundle?: boolean;
+}) {
+	RUNNING_BUILDERS.forEach(
+		(runningBuilder) => runningBuilder.stop && runningBuilder.stop()
+	);
+
+	const routesModule = join(tmpdir(), `./functionsRoutes-${Math.random()}.mjs`);
+	const baseURL = toUrlPath("/");
+
+	const config: Config = await generateConfigFromFileTree({
+		baseDir: functionsDirectory,
+		baseURL,
+	});
+
+	if (!config.routes || config.routes.length === 0) {
+		throw new FunctionsNoRoutesError(
+			`Failed to find any routes while compiling Functions in: ${functionsDirectory}`
+		);
+	}
+
+	if (routesOutputPath) {
+		const routesJSON = convertRoutesToRoutesJSONSpec(config.routes);
+		writeFileSync(routesOutputPath, JSON.stringify(routesJSON, null, 2));
+	}
+
+	if (outputConfigPath) {
+		writeFileSync(
+			outputConfigPath,
+			JSON.stringify({ ...config, baseURL }, null, 2)
+		);
+	}
+
+	await writeRoutesModule({
+		config,
+		srcDir: functionsDirectory,
+		outfile: routesModule,
+	});
+
+	const absoluteFunctionsDirectory = resolve(functionsDirectory);
+
+	if (plugin) {
+		RUNNING_BUILDERS.push(
+			await buildPlugin({
+				routesModule,
+				outfile,
+				minify,
+				sourcemap,
+				watch,
+				nodeCompat,
+				functionsDirectory: absoluteFunctionsDirectory,
+				local,
+				betaD1Shims: d1Databases,
+				onEnd,
+			})
+		);
+	} else {
+		RUNNING_BUILDERS.push(
+			await buildWorker({
+				routesModule,
+				outfile,
+				minify,
+				sourcemap,
+				fallbackService,
+				watch,
+				functionsDirectory: absoluteFunctionsDirectory,
+				local,
+				betaD1Shims: d1Databases,
+				onEnd,
+				buildOutputDirectory,
+				nodeCompat,
+				experimentalWorkerBundle,
+			})
+		);
+	}
+}

package/src/pages/dev.ts

@@ -10,7 +10,7 @@ import { FatalError } from "../errors";
 import { logger } from "../logger";
 import * as metrics from "../metrics";
 import { getBasePath } from "../paths";
-import { buildFunctions } from "./build";
+import { buildFunctions } from "./buildFunctions";
 import { ROUTES_SPEC_VERSION, SECONDS_TO_WAIT_FOR_PROXY } from "./constants";
 import { FunctionsNoRoutesError, getFunctionsNoRoutesWarning } from "./errors";
 import { buildRawWorker, checkRawWorker } from "./functions/buildWorker";
@@ -89,6 +89,13 @@ export function Options(yargs: Argv) {
 				default: true,
 				description: "Whether to run bundling on `_worker.js`",
 			},
+			"experimental-worker-bundle": {
+				type: "boolean",
+				default: false,
+				hidden: true,
+				description:
+					"Whether to process non-JS module imports or not, such as wasm/text/binary, when we run bundling on `functions` or `_worker.js`",
+			},
 			binding: {
 				type: "array",
 				description: "Bind variable/secret (KEY=VALUE)",
@@ -175,6 +182,7 @@ export const Handler = async ({
 	"script-path": singleWorkerScriptPath,
 	bundle,
 	noBundle,
+	experimentalWorkerBundle,
 	binding: bindings = [],
 	kv: kvs = [],
 	do: durableObjects = [],
@@ -270,7 +278,7 @@ export const Handler = async ({
 			await checkRawWorker(workerScriptPath, () => scriptReadyResolve());
 		};
 
-		const enableBundling = bundle || !noBundle;
+		const enableBundling = bundle || !noBundle || experimentalWorkerBundle;
 		if (enableBundling) {
 			// We want to actually run the `_worker.js` script through the bundler
 			// So update the final path to the script that will be uploaded and
@@ -286,6 +294,7 @@ export const Handler = async ({
 						sourcemap: true,
 						watch: true,
 						onEnd: () => scriptReadyResolve(),
+						experimentalWorkerBundle,
 					});
 				} catch (e: unknown) {
 					logger.warn("Failed to bundle _worker.js.", e);
@@ -323,6 +332,7 @@ export const Handler = async ({
 					buildOutputDirectory: directory,
 					nodeCompat,
 					local: true,
+					experimentalWorkerBundle,
 				});
 				await metrics.sendMetricsEvent("build pages functions");
 			};

package/src/pages/functions/buildPlugin.ts

@@ -37,6 +37,7 @@ export function buildPlugin({
 			betaD1Shims: (betaD1Shims || []).map(
 				(binding) => `${D1_BETA_PREFIX}${binding}`
 			),
+			doBindings: [], // Pages functions don't support internal Durable Objects
 			plugins: [
 				buildNotifierPlugin(onEnd),
 				{

package/src/pages/functions/buildWorker.ts

@@ -21,6 +21,7 @@ export type Options = {
 	functionsDirectory: string;
 	local: boolean;
 	betaD1Shims?: string[];
+	experimentalWorkerBundle?: boolean;
 };
 
 export function buildWorker({
@@ -36,6 +37,7 @@ export function buildWorker({
 	functionsDirectory,
 	local,
 	betaD1Shims,
+	experimentalWorkerBundle = false,
 }: Options) {
 	return bundleWorker(
 		{
@@ -60,6 +62,7 @@ export function buildWorker({
 			betaD1Shims: (betaD1Shims || []).map(
 				(binding) => `${D1_BETA_PREFIX}${binding}`
 			),
+			doBindings: [], // Pages functions don't support internal Durable Objects
 			plugins: [
 				buildNotifierPlugin(onEnd),
 				{
@@ -139,7 +142,7 @@ export function buildWorker({
 			],
 			isOutfile: true,
 			serveAssetsFromWorker: false,
-			disableModuleCollection: true,
+			disableModuleCollection: experimentalWorkerBundle ? false : true,
 			rules: [],
 			checkFetch: local,
 			targetConsumer: local ? "dev" : "publish",
@@ -162,6 +165,7 @@ export type RawOptions = {
 	nodeCompat?: boolean;
 	local: boolean;
 	betaD1Shims?: string[];
+	experimentalWorkerBundle?: boolean;
 };
 
 /**
@@ -183,6 +187,7 @@ export function buildRawWorker({
 	nodeCompat,
 	local,
 	betaD1Shims,
+	experimentalWorkerBundle = false,
 }: RawOptions) {
 	return bundleWorker(
 		{
@@ -204,10 +209,11 @@ export function buildRawWorker({
 			betaD1Shims: (betaD1Shims || []).map(
 				(binding) => `${D1_BETA_PREFIX}${binding}`
 			),
+			doBindings: [], // Pages functions don't support internal Durable Objects
 			plugins: [...plugins, buildNotifierPlugin(onEnd)],
 			isOutfile: true,
 			serveAssetsFromWorker: false,
-			disableModuleCollection: true,
+			disableModuleCollection: experimentalWorkerBundle ? false : true,
 			rules: [],
 			checkFetch: local,
 			targetConsumer: local ? "dev" : "publish",