wrangler 0.0.0-e6c9c5c0 → 0.0.0-e6e1daba

package/src/__tests__/user.test.ts

@@ -60,7 +60,7 @@ describe("User", () => {
 			expect(counter).toBe(1);
 			expect(std.out).toMatchInlineSnapshot(`
 			"Attempting to login via OAuth...
-			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20ssl_certs%3Awrite%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
 			Successfully logged in."
 		`);
 			expect(readAuthConfigFile()).toEqual<UserAuthConfig>({

package/src/__tests__/whoami.test.tsx

@@ -160,7 +160,7 @@ describe("getUserInfo()", () => {
 		await getUserInfo();
 
 		expect(std.warn).toMatchInlineSnapshot(`
-		      "▲ [WARNING] It looks like you have used Wrangler 1's \`config\` command to login with an API token.
+		      "▲ [WARNING] It looks like you have used Wrangler v1's \`config\` command to login with an API token.
 
 		        This is no longer supported in the current version of Wrangler.
 		        If you wish to authenticate via an API token then please set the \`CLOUDFLARE_API_TOKEN\`

package/src/__tests__/worker-namespace.test.ts

@@ -17,7 +17,7 @@ describe("dispatch-namespace", () => {
 	mockAccountId();
 	mockApiToken();
 
-	it("should should display a list of available subcommands, for dispatch-namespace with no subcommand", async () => {
+	it("should display a list of available subcommands, for dispatch-namespace with no subcommand", async () => {
 		await runWrangler("dispatch-namespace");
 
 		// wait a tick for the help menu to be printed
@@ -39,10 +39,11 @@ describe("dispatch-namespace", () => {
 		  wrangler dispatch-namespace rename <old-name> <new-name>  Rename a dispatch namespace
 
 		Flags:
-		  -c, --config   Path to .toml configuration file  [string]
-		  -e, --env      Environment to use for operations and .env files  [string]
-		  -h, --help     Show help  [boolean]
-		  -v, --version  Show version number  [boolean]",
+		  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+		  -c, --config                    Path to .toml configuration file  [string]
+		  -e, --env                       Environment to use for operations and .env files  [string]
+		  -h, --help                      Show help  [boolean]
+		  -v, --version                   Show version number  [boolean]",
 		  "warn": "",
 		}
 	`);
@@ -92,10 +93,11 @@ describe("dispatch-namespace", () => {
 			  name  Name of the dispatch namespace  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 
@@ -141,10 +143,11 @@ describe("dispatch-namespace", () => {
 			  name  Name of the dispatch namespace  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 
@@ -201,10 +204,11 @@ describe("dispatch-namespace", () => {
 			  name  Name of the dispatch namespace  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 
@@ -313,10 +317,11 @@ describe("dispatch-namespace", () => {
 			  new-name  New name of the dispatch namespace  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 

package/src/api/dev.ts

@@ -100,7 +100,6 @@ export async function unstable_dev(
 		showInteractiveDevSession,
 		testMode,
 		testScheduled,
-		watch,
 		// 2. options for alpha/beta products/libs
 		d1Databases,
 		experimentalLocal,
@@ -139,20 +138,54 @@ export async function unstable_dev(
 					local: true,
 					d1Databases,
 					disableDevRegistry,
-					testScheduled,
-					experimentalLocal,
-					experimentalLocalRemoteKv,
+					testScheduled: testScheduled ?? false,
+					experimentalLocal: experimentalLocal ?? false,
+					experimentalLocalRemoteKv: experimentalLocalRemoteKv ?? false,
 					enablePagesAssetsServiceBinding,
 					liveReload,
 					showInteractiveDevSession,
 					forceLocal,
-					watch,
-					...options,
 					onReady: (address, port) => {
 						readyPort = port;
 						readyAddress = address;
 						ready(devServer);
 					},
+					config: options?.config,
+					env: options?.env,
+					bundle: options?.bundle,
+					compatibilityDate: options?.compatibilityDate,
+					compatibilityFlags: options?.compatibilityFlags,
+					ip: options?.ip,
+					inspectorPort: options?.inspectorPort,
+					v: undefined,
+					localProtocol: options?.localProtocol,
+					assets: options?.assets,
+					site: options?.site, // Root folder of static assets for Workers Sites
+					siteInclude: options?.siteInclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.
+					siteExclude: options?.siteExclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.
+					nodeCompat: options?.nodeCompat, // Enable node.js compatibility
+					persist: options?.persist, // Enable persistence for local mode, using default path: .wrangler/state
+					persistTo: options?.persistTo, // Specify directory to use for local persistence (implies --persist)
+					experimentalJsonConfig: undefined,
+					name: undefined,
+					noBundle: false,
+					format: undefined,
+					latest: false,
+					routes: undefined,
+					host: undefined,
+					localUpstream: undefined,
+					experimentalPublic: undefined,
+					upstreamProtocol: undefined,
+					var: undefined,
+					define: undefined,
+					jsxFactory: undefined,
+					jsxFragment: undefined,
+					tsconfig: undefined,
+					minify: undefined,
+					experimentalEnableLocalPersistence: undefined,
+					legacyEnv: undefined,
+					public: undefined,
+					...options,
 				});
 			}).then((devServer) => {
 				// now that the inner promise has resolved, we can resolve the outer promise
@@ -190,22 +223,58 @@ export async function unstable_dev(
 					inspect: false,
 					_: [],
 					$0: "",
+					logLevel: options?.logLevel ?? "log",
+					port: options?.port ?? 0,
 					local: true,
 					showInteractiveDevSession,
 					d1Databases,
 					disableDevRegistry,
-					testScheduled,
-					experimentalLocal,
-					experimentalLocalRemoteKv,
+					testScheduled: testScheduled ?? false,
+					experimentalLocal: experimentalLocal ?? false,
+					experimentalLocalRemoteKv: experimentalLocalRemoteKv ?? false,
 					enablePagesAssetsServiceBinding,
 					liveReload,
-					watch,
-					...options,
 					onReady: (address, port) => {
 						readyPort = port;
 						readyAddress = address;
 						ready(devServer);
 					},
+					config: options?.config,
+					env: options?.env,
+					bundle: options?.bundle,
+					compatibilityDate: options?.compatibilityDate,
+					compatibilityFlags: options?.compatibilityFlags,
+					ip: options?.ip,
+					inspectorPort: options?.inspectorPort,
+					v: undefined,
+					localProtocol: options?.localProtocol,
+					assets: options?.assets,
+					site: options?.site, // Root folder of static assets for Workers Sites
+					siteInclude: options?.siteInclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.
+					siteExclude: options?.siteExclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.
+					nodeCompat: options?.nodeCompat, // Enable node.js compatibility
+					persist: options?.persist, // Enable persistence for local mode, using default path: .wrangler/state
+					persistTo: options?.persistTo, // Specify directory to use for local persistence (implies --persist)
+					experimentalJsonConfig: undefined,
+					name: undefined,
+					noBundle: false,
+					format: undefined,
+					latest: false,
+					routes: undefined,
+					host: undefined,
+					localUpstream: undefined,
+					experimentalPublic: undefined,
+					upstreamProtocol: undefined,
+					var: undefined,
+					define: undefined,
+					jsxFactory: undefined,
+					jsxFragment: undefined,
+					tsconfig: undefined,
+					minify: undefined,
+					experimentalEnableLocalPersistence: undefined,
+					legacyEnv: undefined,
+					public: undefined,
+					...options,
 				});
 			}).then((devServer) => {
 				resolve({

package/src/api/index.ts

@@ -1,3 +1,11 @@
 export { unstable_dev } from "./dev";
 export type { UnstableDevWorker, UnstableDevOptions } from "./dev";
 export { unstable_pages } from "./pages";
+export {
+	uploadMTlsCertificate,
+	uploadMTlsCertificateFromFs,
+	listMTlsCertificates,
+	getMTlsCertificate,
+	getMTlsCertificateByName,
+	deleteMTlsCertificate,
+} from "./mtls-certificate";

package/src/api/mtls-certificate.ts

@@ -0,0 +1,148 @@
+import { fetchResult } from "../cfetch";
+import { readFileSync } from "../parse";
+
+/**
+ * the representation of an mTLS certificate in the account certificate store
+ */
+export interface MTlsCertificateResponse {
+	id: string;
+	name?: string;
+	ca: boolean;
+	certificates: string;
+	expires_on: string;
+	issuer: string;
+	serial_number: string;
+	signature: string;
+	uploaded_on: string;
+}
+
+/**
+ * details for uploading an mTLS certificate from disk
+ */
+export interface MTlsCertificateUploadDetails {
+	certificateChainFilename: string;
+	privateKeyFilename: string;
+	name?: string;
+}
+
+/**
+ * details for uploading an mTLS certificate via the ssl api
+ */
+export interface MTlsCertificateBody {
+	certificateChain: string;
+	privateKey: string;
+	name?: string;
+}
+
+/**
+ * supported filters for listing mTLS certificates via the ssl api
+ */
+export interface MTlsCertificateListFilter {
+	name?: string;
+}
+
+/**
+ * indicates that looking up a certificate by name failed due to zero matching results
+ */
+export class ErrorMTlsCertificateNameNotFound extends Error {}
+
+/**
+ * indicates that looking up a certificate by name failed due to more than one matching results
+ */
+export class ErrorMTlsCertificateManyNamesMatch extends Error {}
+
+/**
+ * reads an mTLS certificate and private key pair from disk and uploads it to the account mTLS certificate store
+ */
+export async function uploadMTlsCertificateFromFs(
+	accountId: string,
+	details: MTlsCertificateUploadDetails
+): Promise<MTlsCertificateResponse> {
+	return await uploadMTlsCertificate(accountId, {
+		certificateChain: readFileSync(details.certificateChainFilename),
+		privateKey: readFileSync(details.privateKeyFilename),
+		name: details.name,
+	});
+}
+
+/**
+ *  uploads an mTLS certificate and private key pair to the account mTLS certificate store
+ */
+export async function uploadMTlsCertificate(
+	accountId: string,
+	body: MTlsCertificateBody
+): Promise<MTlsCertificateResponse> {
+	return await fetchResult(`/accounts/${accountId}/mtls_certificates`, {
+		method: "POST",
+		body: JSON.stringify({
+			name: body.name,
+			certificates: body.certificateChain,
+			private_key: body.privateKey,
+			ca: false,
+		}),
+	});
+}
+
+/**
+ *  fetches an mTLS certificate from the account mTLS certificate store by ID
+ */
+export async function getMTlsCertificate(
+	accountId: string,
+	id: string
+): Promise<MTlsCertificateResponse> {
+	return await fetchResult(
+		`/accounts/${accountId}/mtls_certificates/${id}`,
+		{}
+	);
+}
+
+/**
+ *  lists mTLS certificates for an account. filtering by name is supported
+ */
+export async function listMTlsCertificates(
+	accountId: string,
+	filter: MTlsCertificateListFilter
+): Promise<MTlsCertificateResponse[]> {
+	const params = new URLSearchParams();
+	params.append("ca", "false");
+	if (filter.name) {
+		params.append("name", filter.name);
+	}
+	return await fetchResult(
+		`/accounts/${accountId}/mtls_certificates`,
+		{},
+		params
+	);
+}
+
+/**
+ *  fetches an mTLS certificate from the account mTLS certificate store by name. will throw an error if no certificates are found, or multiple are found with that name
+ */
+export async function getMTlsCertificateByName(
+	accountId: string,
+	name: string
+): Promise<MTlsCertificateResponse> {
+	const certificates = await listMTlsCertificates(accountId, { name });
+	if (certificates.length === 0) {
+		throw new ErrorMTlsCertificateNameNotFound(
+			`certificate not found with name "${name}"`
+		);
+	}
+	if (certificates.length > 1) {
+		throw new ErrorMTlsCertificateManyNamesMatch(
+			`multiple certificates found with name "${name}"`
+		);
+	}
+	const certificate = certificates[0];
+	return certificate;
+}
+
+export async function deleteMTlsCertificate(
+	accountId: string,
+	certificateId: string
+) {
+	return await fetchResult(
+		`/accounts/${accountId}/mtls_certificates/${certificateId}`,
+		{ method: "DELETE" }
+	);
+}

package/src/api/pages/create-worker-bundle-contents.ts

@@ -0,0 +1,75 @@
+import { readFileSync } from "node:fs";
+import path from "node:path";
+import { Response } from "undici";
+import { createWorkerUploadForm } from "../../create-worker-upload-form";
+import type { BundleResult } from "../../bundle";
+import type { CfWorkerInit } from "../../worker";
+import type { Blob } from "node:buffer";
+import type { FormData } from "undici";
+
+/**
+ * Takes a Worker bundle - `BundleResult` - and generates the _worker.bundle
+ * contents
+ */
+export async function createUploadWorkerBundleContents(
+	workerBundle: BundleResult
+): Promise<Blob> {
+	const workerBundleFormData = createWorkerBundleFormData(workerBundle);
+	const metadata = JSON.parse(workerBundleFormData.get("metadata") as string);
+
+	/**
+	 * Pages doesn't need the metadata bindings returned by
+	 * `createWorkerBundleFormData`. Let's strip them out and return only
+	 * the contents we need
+	 */
+	workerBundleFormData.set(
+		"metadata",
+		JSON.stringify({ main_module: metadata.main_module })
+	);
+
+	return await new Response(workerBundleFormData).blob();
+}
+
+/**
+ * Creates a `FormData` upload from a `BundleResult`
+ */
+function createWorkerBundleFormData(workerBundle: BundleResult): FormData {
+	const mainModule = {
+		name: path.basename(workerBundle.resolvedEntryPointPath),
+		content: readFileSync(workerBundle.resolvedEntryPointPath, {
+			encoding: "utf-8",
+		}),
+		type: workerBundle.bundleType || "esm",
+	};
+
+	const worker: CfWorkerInit = {
+		name: mainModule.name,
+		main: mainModule,
+		modules: workerBundle.modules,
+		bindings: {
+			vars: undefined,
+			kv_namespaces: undefined,
+			wasm_modules: undefined,
+			text_blobs: undefined,
+			data_blobs: undefined,
+			durable_objects: undefined,
+			queues: undefined,
+			r2_buckets: undefined,
+			d1_databases: undefined,
+			services: undefined,
+			analytics_engine_datasets: undefined,
+			dispatch_namespaces: undefined,
+			mtls_certificates: undefined,
+			logfwdr: undefined,
+			unsafe: undefined,
+		},
+		migrations: undefined,
+		compatibility_date: undefined,
+		compatibility_flags: undefined,
+		usage_model: undefined,
+		keepVars: undefined,
+		logpush: undefined,
+	};
+
+	return createWorkerUploadForm(worker);
+}

package/src/api/pages/publish.tsx

@@ -17,6 +17,8 @@ import {
 } from "../../pages/functions/buildWorker";
 import { validateRoutes } from "../../pages/functions/routes-validation";
 import { upload } from "../../pages/upload";
+import { createUploadWorkerBundleContents } from "./create-worker-bundle-contents";
+import type { BundleResult } from "../../bundle";
 import type { Project, Deployment } from "@cloudflare/types";
 
 interface PagesPublishOptions {
@@ -67,6 +69,14 @@ interface PagesPublishOptions {
 	 */
 	bundle?: boolean;
 
+	/**
+	 * Whether to process non-JS module imports or not, such as
+	 * wasm/text/binary, when we run bundling on `functions` or
+	 * `_worker.js`
+	 * Default: false
+	 */
+	experimentalWorkerBundle?: boolean;
+
 	// TODO: Allow passing in the API key and plumb it through
 	// to the API calls so that the publish function does not
 	// rely on the `CLOUDFLARE_API_KEY` environment variable
@@ -88,6 +98,7 @@ export async function publish({
 	commitDirty,
 	functionsDirectory: customFunctionsDirectory,
 	bundle,
+	experimentalWorkerBundle,
 }: PagesPublishOptions) {
 	let _headers: string | undefined,
 		_redirects: string | undefined,
@@ -132,6 +143,8 @@ export async function publish({
 	 * Functions first and exit if it failed
 	 */
 	let builtFunctions: string | undefined = undefined;
+	let workerBundle: BundleResult | undefined = undefined;
+
 	const functionsDirectory =
 		customFunctionsDirectory || join(cwd(), "functions");
 	const routesOutputPath = !existsSync(join(directory, "_routes.json"))
@@ -141,6 +154,11 @@ export async function publish({
 	// Routing configuration displayed in the Functions tab of a deployment in Dash
 	let filepathRoutingConfig: string | undefined;
 
+	const d1Databases = Object.keys(
+		project.deployment_configs[isProduction ? "production" : "preview"]
+			.d1_databases ?? {}
+	);
+
 	if (!_workerJS && existsSync(functionsDirectory)) {
 		const outfile = join(tmpdir(), `./functionsWorker-${Math.random()}.js`);
 		const outputConfigPath = join(
@@ -149,7 +167,7 @@ export async function publish({
 		);
 
 		try {
-			await buildFunctions({
+			workerBundle = await buildFunctions({
 				outfile,
 				outputConfigPath,
 				functionsDirectory,
@@ -157,10 +175,8 @@ export async function publish({
 				buildOutputDirectory: dirname(outfile),
 				routesOutputPath,
 				local: false,
-				d1Databases: Object.keys(
-					project.deployment_configs[isProduction ? "production" : "preview"]
-						.d1_databases ?? {}
-				),
+				d1Databases,
+				experimentalWorkerBundle,
 			});
 
 			builtFunctions = readFileSync(outfile, "utf-8");
@@ -232,9 +248,11 @@ export async function publish({
 	 */
 	if (_workerJS) {
 		let workerFileContents = _workerJS;
-		if (bundle) {
+		const enableBundling = bundle || experimentalWorkerBundle;
+
+		if (enableBundling) {
 			const outfile = join(tmpdir(), `./bundledWorker-${Math.random()}.mjs`);
-			await buildRawWorker({
+			workerBundle = await buildRawWorker({
 				workerScriptPath,
 				outfile,
 				directory: directory ?? ".",
@@ -242,14 +260,31 @@ export async function publish({
 				sourcemap: true,
 				watch: false,
 				onEnd: () => {},
+				betaD1Shims: d1Databases,
+				experimentalWorkerBundle,
 			});
 			workerFileContents = readFileSync(outfile, "utf8");
 		} else {
 			await checkRawWorker(workerScriptPath, () => {});
 		}
 
-		formData.append("_worker.js", new File([workerFileContents], "_worker.js"));
-		logger.log(`✨ Uploading _worker.js`);
+		if (experimentalWorkerBundle) {
+			const workerBundleContents = await createUploadWorkerBundleContents(
+				workerBundle as BundleResult
+			);
+
+			formData.append(
+				"_worker.bundle",
+				new File([workerBundleContents], "_worker.bundle")
+			);
+			logger.log(`✨ Uploading Worker bundle`);
+		} else {
+			formData.append(
+				"_worker.js",
+				new File([workerFileContents], "_worker.js")
+			);
+			logger.log(`✨ Uploading _worker.js`);
+		}
 
 		if (_routesCustom) {
 			// user provided a custom _routes.json file
@@ -275,9 +310,21 @@ export async function publish({
 	 * https://developers.cloudflare.com/pages/platform/functions/
 	 */
 	if (builtFunctions && !_workerJS) {
-		// if Functions were build successfully, proceed to uploading the build file
-		formData.append("_worker.js", new File([builtFunctions], "_worker.js"));
-		logger.log(`✨ Uploading Functions`);
+		if (experimentalWorkerBundle) {
+			const workerBundleContents = await createUploadWorkerBundleContents(
+				workerBundle as BundleResult
+			);
+
+			formData.append(
+				"_worker.bundle",
+				new File([workerBundleContents], "_worker.bundle")
+			);
+			logger.log(`✨ Uploading Functions bundle`);
+		} else {
+			// if Functions were build successfully, proceed to uploading the build file
+			formData.append("_worker.js", new File([builtFunctions], "_worker.js"));
+			logger.log(`✨ Uploading Functions`);
+		}
 
 		if (_routesCustom) {
 			// user provided a custom _routes.json file

package/src/bundle.ts

@@ -116,7 +116,7 @@ export async function bundleWorker(
 		loader?: Record<string, string>;
 		sourcemap?: esbuild.CommonOptions["sourcemap"];
 		plugins?: esbuild.Plugin[];
-		// TODO: Rip these out https://github.com/cloudflare/wrangler2/issues/2153
+		// TODO: Rip these out https://github.com/cloudflare/workers-sdk/issues/2153
 		disableModuleCollection?: boolean;
 		isOutfile?: boolean;
 	}
@@ -333,18 +333,19 @@ export async function bundleWorker(
 		inject,
 		external: ["__STATIC_CONTENT_MANIFEST"],
 		format: entry.format === "modules" ? "esm" : "iife",
-		target: "es2020",
+		// Our workerd runtime uses the same V8 version as recent Chrome, which is highly ES2022 compliant: https://kangax.github.io/compat-table/es2016plus/
+		target: "es2022",
 		sourcemap: sourcemap ?? true, // this needs to use ?? to accept false
 		// Include a reference to the output folder in the sourcemap.
 		// This is omitted by default, but we need it to properly resolve source paths in error output.
 		sourceRoot: destination,
 		minify,
 		metafile: true,
-		conditions: ["worker", "browser"],
+		conditions: ["workerd", "worker", "browser"],
 		...(process.env.NODE_ENV && {
 			define: {
 				// use process.env["NODE_ENV" + ""] so that esbuild doesn't replace it
-				// when we do a build of wrangler. (re: https://github.com/cloudflare/wrangler2/issues/1477)
+				// when we do a build of wrangler. (re: https://github.com/cloudflare/workers-sdk/issues/1477)
 				"process.env.NODE_ENV": `"${process.env["NODE_ENV" + ""]}"`,
 				...(nodeCompat ? { global: "globalThis" } : {}),
 				...(checkFetch ? { fetch: "checkedFetch" } : {}),
@@ -574,9 +575,10 @@ async function applyMiddlewareLoaderFacade(
 			],
 			outfile: targetPathInsertion,
 		});
-
-		let targetPathLoader = path.join(tmpDirPath, path.basename(entry.file));
-		if (path.extname(entry.file) === "") targetPathLoader += ".js";
+		const targetPathLoader = path.join(
+			tmpDirPath,
+			"middleware-loader.entry.js"
+		);
 		const loaderPath = path.resolve(
 			getBasePath(),
 			"templates/middleware/loader-modules.ts"