wrangler 2.7.1 → 2.8.1

package/src/bundle.ts

@@ -9,10 +9,10 @@ import tmp from "tmp-promise";
 import createModuleCollector from "./module-collection";
 import { getBasePath, toUrlPath } from "./paths";
 import type { Config } from "./config";
+import type { DurableObjectBindings } from "./config/environment";
 import type { WorkerRegistry } from "./dev-registry";
 import type { Entry } from "./entry";
 import type { CfModule } from "./worker";
-
 export type BundleResult = {
 	modules: CfModule[];
 	dependencies: esbuild.Metafile["outputs"][string]["inputs"];
@@ -95,6 +95,7 @@ export async function bundleWorker(
 		serveAssetsFromWorker: boolean;
 		assets?: StaticAssetsConfig;
 		betaD1Shims?: string[];
+		doBindings: DurableObjectBindings;
 		jsxFactory?: string;
 		jsxFragment?: string;
 		rules: Config["rules"];
@@ -123,6 +124,7 @@ export async function bundleWorker(
 	const {
 		serveAssetsFromWorker,
 		betaD1Shims,
+		doBindings,
 		jsxFactory,
 		jsxFragment,
 		rules,
@@ -271,7 +273,13 @@ export async function bundleWorker(
 		Array.isArray(betaD1Shims) &&
 			betaD1Shims.length > 0 &&
 			((currentEntry: Entry) => {
-				return applyD1BetaFacade(currentEntry, tmpDir.path, betaD1Shims, local);
+				return applyD1BetaFacade(
+					currentEntry,
+					tmpDir.path,
+					betaD1Shims,
+					local,
+					doBindings
+				);
 			}),
 
 		// Middleware loader: to add middleware, we add the path to the middleware
@@ -395,13 +403,23 @@ export async function bundleWorker(
 		_path.includes(".map")
 	)[0];
 
+	const resolvedEntryPointPath = path.resolve(
+		entry.directory,
+		entryPointOutputs[0][0]
+	);
+
+	// copy all referenced modules into the output bundle directory
+	for (const module of moduleCollector.modules) {
+		fs.writeFileSync(
+			path.join(path.dirname(resolvedEntryPointPath), module.name),
+			module.content
+		);
+	}
+
 	return {
 		modules: moduleCollector.modules,
 		dependencies,
-		resolvedEntryPointPath: path.resolve(
-			entry.directory,
-			entryPointOutputs[0][0]
-		),
+		resolvedEntryPointPath,
 		bundleType,
 		stop: result.stop,
 		sourceMapPath,
@@ -779,17 +797,51 @@ async function applyFirstPartyWorkerDevFacade(
  * This code be removed from here when the API is in Workers core,
  * but moved inside Miniflare for simulating D1.
  */
-
 async function applyD1BetaFacade(
 	entry: Entry,
 	tmpDirPath: string,
 	betaD1Shims: string[],
-	local: boolean
+	local: boolean,
+	doBindings: DurableObjectBindings
 ): Promise<Entry> {
+	let entrypointPath = path.resolve(
+		getBasePath(),
+		"templates/d1-beta-facade.js"
+	);
+	if (Array.isArray(doBindings) && doBindings.length > 0) {
+		//we have DO bindings, so we need to shim them
+		const maskedDoBindings = doBindings
+			// Don't shim anything not local to this worker
+			.filter((b) => !b.script_name)
+			// Reexport the DO classnames
+			.map(
+				(b) =>
+					`export const ${b.class_name} = maskDurableObjectDefinition(OTHER_EXPORTS.${b.class_name});`
+			)
+			.join("\n");
+		const baseFile = fs.readFileSync(
+			path.resolve(getBasePath(), "templates/d1-beta-facade.js"),
+			"utf8"
+		);
+		//getMaskedEnv is already used to shim regular Workers
+		const contents = `
+		${baseFile}
+
+		var maskDurableObjectDefinition = (cls) =>
+		class extends cls {
+			constructor(state, env) {
+				super(state, getMaskedEnv(env));
+			}
+		};
+		${maskedDoBindings}`;
+		const doD1FacadePath = path.join(tmpDirPath, "d1-do-facade.js");
+		//write our shim so we can build it
+		fs.writeFileSync(doD1FacadePath, contents);
+		entrypointPath = doD1FacadePath;
+	}
 	const targetPath = path.join(tmpDirPath, "d1-beta-facade.entry.js");
-
 	await esbuild.build({
-		entryPoints: [path.resolve(getBasePath(), "templates/d1-beta-facade.js")],
+		entryPoints: [entrypointPath],
 		bundle: true,
 		format: "esm",
 		sourcemap: true,

package/src/cfetch/internal.ts

@@ -252,9 +252,6 @@ export async function fetchDashboardScript(
 		}
 
 		return file ?? "";
-
-		// Follow up on issue in Undici about multipart/form-data support & replace the workaround: https://github.com/nodejs/undici/issues/974
-		// This should be using a builtin formData() parser pattern.
 	} else {
 		return response.text();
 	}

package/src/cli.ts

@@ -1,6 +1,6 @@
 import process from "process";
 import { hideBin } from "yargs/helpers";
-import { unstable_dev } from "./api";
+import { unstable_dev, unstable_pages } from "./api";
 import { FatalError } from "./errors";
 import { main } from ".";
 
@@ -24,5 +24,5 @@ if (typeof jest === "undefined" && require.main === module) {
  * It makes it possible to import wrangler from 'wrangler',
  * and call wrangler.unstable_dev().
  */
-export { unstable_dev };
+export { unstable_dev, unstable_pages };
 export type { UnstableDevWorker, UnstableDevOptions };

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/backups.tsx

@@ -191,11 +191,7 @@ export const DownloadHandler = withConfig<BackupDownloadArgs>(
 			name
 		);
 		const filename =
-			output ||
-			path.join(
-				process.env.INIT_CWD as string,
-				`${name}.${backupId.slice(0, 8)}.sqlite3`
-			);
+			output || path.resolve(`${name}.${backupId.slice(0, 8)}.sqlite3`);
 
 		logger.log(`🌀 Downloading backup ${backupId} from '${name}'`);
 		const response = await getBackupResponse(accountId, db.uuid, backupId);

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/remote.tsx

@@ -12,6 +12,7 @@ import {
 import useInspector from "../inspect";
 import { logger } from "../logger";
 import { startPreviewServer, usePreviewServer } from "../proxy";
+import { helpIfErrorIsSizeOrScriptStartup } from "../publish/publish";
 import { syncAssets } from "../sites";
 import {
 	getAccountChoices,
@@ -494,6 +495,7 @@ export async function getRemotePreviewToken(props: RemoteProps) {
 				// code 10049 happens when the preview token expires
 				logger.log("Preview token expired, restart server to fetch a new one");
 			} else {
+				helpIfErrorIsSizeOrScriptStartup(err, props.bundle?.dependencies || {});
 				logger.error("Error on remote worker:", err);
 			}
 		}

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/docs/index.ts

@@ -11,6 +11,7 @@ import type {
 import type { ArgumentsCamelCase, Argv } from "yargs";
 
 const argToUrlHash = {
+	d1: "d1",
 	docs: "docs",
 	init: "init",
 	generate: "generate",
@@ -56,7 +57,7 @@ export function docsOptions(yargs: Argv<CommonYargsOptions>) {
 			"r2 object",
 			"r2 bucket",
 			// "dispatch-namespace", // TODO: Undocumented - Workers for Platforms
-			// "d1", //TODO: Undocumented
+			"d1",
 			// "pubsub", //TODO: Undocumented
 			"login",
 			"logout",

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/init.ts

@@ -599,7 +599,7 @@ export async function initHandler(args: InitArgs) {
 					isWritingScripts: shouldWritePackageJsonScripts,
 					isCreatingWranglerToml: justCreatedWranglerToml,
 					packagePath: pathToPackageJson,
-					scriptPath: "src/index.ts",
+					scriptPath: "src/index.js",
 					//? Should we have Environment argument for `wrangler init --from-dash` - Jacob
 					extraToml: (await getWorkerConfig(accountId, fromDashScriptName, {
 						defaultEnvironment,

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