drop unused WRANGLER_UNENV_RESOLVE_PATHS env var (#9593)

Author: vicb

.changeset/sharp-phones-hope.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+drop unused `WRANGLER_UNENV_RESOLVE_PATHS` env var

packages/unenv-preset/tests/index.test.ts

@@ -25,19 +25,11 @@ describe(`@cloudflare/unenv-preset ${platform} ${workerdPath}`, () => {
 		// rather than the one bundled with wrangler.
 		const MINIFLARE_WORKERD_PATH = workerdPath;
 
-		// Use the preset from the local `@cloudflare/unenv-preset` and `unjs/unenv`
-		// rather than the one bundled with wrangler.
-		const WRANGLER_UNENV_RESOLVE_PATHS = [
-			localPresetResolveBaseDir,
-			localUnenvResolveBaseDir,
-		].join(",");
-
 		wrangler = await runWranglerDev(
 			path.join(__dirname, "worker"),
 			["--port=0", "--inspector-port=0"],
 			{
 				MINIFLARE_WORKERD_PATH,
-				WRANGLER_UNENV_RESOLVE_PATHS,
 			}
 		);
 	});

packages/wrangler/src/deployment-bundle/bundle.ts

@@ -5,7 +5,6 @@ import * as esbuild from "esbuild";
 import {
 	getBuildConditionsFromEnv,
 	getBuildPlatformFromEnv,
-	getUnenvResolvePathsFromEnv,
 } from "../environment-variables/misc-variables";
 import { UserError } from "../errors";
 import { getFlag } from "../experimental-flags";
@@ -375,8 +374,6 @@ export async function bundleWorker(
 		},
 	};
 
-	const unenvResolvePaths = getUnenvResolvePathsFromEnv()?.split(",");
-
 	const buildOptions = {
 		// Don't use entryFile here as the file may have been changed when applying the middleware
 		entryPoints: [entry.file],
@@ -423,10 +420,9 @@ export async function bundleWorker(
 		plugins: [
 			aliasPlugin,
 			moduleCollector.plugin,
-			...(await getNodeJSCompatPlugins({
+			...getNodeJSCompatPlugins({
 				mode: nodejsCompatMode ?? null,
-				unenvResolvePaths,
-			})),
+			}),
 			cloudflareInternalPlugin,
 			buildResultPlugin,
 			...(plugins || []),

packages/wrangler/src/deployment-bundle/esbuild-plugins/hybrid-nodejs-compat.ts

@@ -11,23 +11,20 @@ const REQUIRED_UNENV_ALIAS_NAMESPACE = "required-unenv-alias";
 /**
  * ESBuild plugin to apply the unenv preset.
  *
- * @param _unenvResolvePaths Root paths used to resolve absolute paths.
  * @returns ESBuild plugin
  */
-export async function nodejsHybridPlugin(
-	_unenvResolvePaths?: string[]
-): Promise<Plugin> {
-	// `unenv` and `@cloudflare/unenv-preset` only publish esm
-	const { defineEnv } = await import("unenv");
-	const { cloudflare } = await import("@cloudflare/unenv-preset");
-	const { alias, inject, external, polyfill } = defineEnv({
-		presets: [cloudflare],
-		npmShims: true,
-	}).env;
-
+export function nodejsHybridPlugin(): Plugin {
 	return {
 		name: "hybrid-nodejs_compat",
-		setup(build) {
+		async setup(build) {
+			// `unenv` and `@cloudflare/unenv-preset` only publish esm
+			const { defineEnv } = await import("unenv");
+			const { cloudflare } = await import("@cloudflare/unenv-preset");
+			const { alias, inject, external, polyfill } = defineEnv({
+				presets: [cloudflare],
+				npmShims: true,
+			}).env;
+
 			errorOnServiceWorkerFormat(build);
 			handleRequireCallsToNodeJSBuiltins(build);
 			handleUnenvAliasedPackages(build, alias, external);

packages/wrangler/src/deployment-bundle/esbuild-plugins/nodejs-plugins.ts

@@ -7,20 +7,19 @@ import type { NodeJSCompatMode } from "miniflare";
 /**
  * Returns the list of ESBuild plugins to use for a given compat mode.
  */
-export async function getNodeJSCompatPlugins({
+export function getNodeJSCompatPlugins({
 	mode,
-	unenvResolvePaths,
 }: {
 	mode: NodeJSCompatMode;
 	unenvResolvePaths?: string[];
-}): Promise<Plugin[]> {
+}): Plugin[] {
 	switch (mode) {
 		case "als":
 			return [asyncLocalStoragePlugin, nodejsCompatPlugin(mode)];
 		case "v1":
 			return [nodejsCompatPlugin(mode)];
 		case "v2":
-			return [await nodejsHybridPlugin(unenvResolvePaths)];
+			return [nodejsHybridPlugin()];
 		case null:
 			return [nodejsCompatPlugin(mode)];
 	}

packages/wrangler/src/environment-variables/factory.ts

@@ -31,7 +31,6 @@ type VariableNames =
 	| "WRANGLER_CI_GENERATE_PREVIEW_ALIAS"
 	| "WRANGLER_BUILD_CONDITIONS"
 	| "WRANGLER_BUILD_PLATFORM"
-	| "WRANGLER_UNENV_RESOLVE_PATHS"
 	| "WRANGLER_REGISTRY_PATH"
 	| "WRANGLER_CONTAINERS_DOCKER_PATH";
 

packages/wrangler/src/environment-variables/misc-variables.ts

@@ -230,19 +230,6 @@ export const getBuildPlatformFromEnv = getEnvironmentVariableFactory({
 	variableName: "WRANGLER_BUILD_PLATFORM",
 });
 
-/**
- * `WRANGLER_UNENV_RESOLVE_PATHS` lists the paths used to resolve unenv.
- *
- * Note: multiple comma separated paths can be specified.
- *
- * By default wrangler uses the unenv preset version installed from the package.json.
- *
- * Setting root paths allow to use a different version of the preset.
- */
-export const getUnenvResolvePathsFromEnv = getEnvironmentVariableFactory({
-	variableName: "WRANGLER_UNENV_RESOLVE_PATHS",
-});
-
 /**
  * `WRANGLER_REGISTRY_PATH` specifies the file based dev registry folder
  */