@cloudflare/vite-plugin 1.23.0 → 1.23.1

package/dist/index.mjs

@@ -21610,7 +21610,17 @@ function createCloudflareEnvironmentOptions({ workerConfig, userConfig, mode, en
 			noDiscovery: false,
 			ignoreOutdatedRequests: true,
 			entries: vite.normalizePath(workerConfig.main),
-			exclude: [...cloudflareBuiltInModules],
+			exclude: [
+				...cloudflareBuiltInModules,
+				...nonPrefixedNodeModules,
+				...nonPrefixedNodeModules.map((module$2) => `node:${module$2}`),
+				...[
+					"node:sea",
+					"node:sqlite",
+					"node:test",
+					"node:test/reporters"
+				]
+			],
 			...isRolldown ? { rolldownOptions: {
 				platform: "neutral",
 				resolve: {
@@ -21620,7 +21630,11 @@ function createCloudflareEnvironmentOptions({ workerConfig, userConfig, mode, en
 				transform: {
 					target,
 					define: define$1
-				}
+				},
+				plugins: [vite.esmExternalRequirePlugin({
+					external: [nodeBuiltinsRE],
+					skipDuplicateCheck: true
+				})]
 			} } : { esbuildOptions: {
 				platform: "neutral",
 				conditions: [...defaultConditions, "development"],
@@ -26307,23 +26321,7 @@ const nodeJsCompatPlugin = createPlugin("nodejs-compat", (ctx) => {
 				...isRolldown ? { build: { rolldownOptions: { plugins: [vite.esmExternalRequirePlugin({
 					external: [...nodeJsCompat.externals],
 					skipDuplicateCheck: true
-				})] } } } : {},
-				optimizeDeps: {
-					exclude: [
-						...nonPrefixedNodeModules,
-						...nonPrefixedNodeModules.map((module$2) => `node:${module$2}`),
-						...[
-							"node:sea",
-							"node:sqlite",
-							"node:test",
-							"node:test/reporters"
-						]
-					],
-					...isRolldown ? { rolldownOptions: { plugins: [vite.esmExternalRequirePlugin({
-						external: [nodeBuiltinsRE],
-						skipDuplicateCheck: true
-					})] } } : {}
-				}
+				})] } } } : {}
 			};
 		},
 		applyToEnvironment(environment) {
@@ -26375,46 +26373,8 @@ const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx)
 	exitCallback$1 = () => {
 		for (const nodeJsCompatWarnings of nodeJsCompatWarningsMap.values()) nodeJsCompatWarnings.renderWarnings();
 	};
-	function resolveId(environmentName, source, importer) {
-		if (!nodeBuiltinsRE.test(source)) return;
-		const workerConfig = ctx.getWorkerConfig(environmentName);
-		const nodeJsCompat = ctx.getNodeJsCompat(environmentName);
-		if (workerConfig && !nodeJsCompat) {
-			if (hasNodeJsAls(workerConfig) && isNodeAlsModule(source)) return;
-			nodeJsCompatWarningsMap.get(workerConfig)?.registerImport(source, importer);
-			return {
-				id: source,
-				external: true
-			};
-		}
-	}
 	return {
 		enforce: "pre",
-		configEnvironment(environmentName) {
-			const workerConfig = ctx.getWorkerConfig(environmentName);
-			const nodeJsCompat = ctx.getNodeJsCompat(environmentName);
-			if (workerConfig && !nodeJsCompat) return { optimizeDeps: { ...isRolldown ? { rolldownOptions: { plugins: [{
-				name: "vite-plugin-cloudflare:nodejs-compat-warnings-resolver",
-				resolveId: {
-					filter: { id: nodeBuiltinsRE },
-					handler(source, importer) {
-						return resolveId(environmentName, source, importer);
-					}
-				}
-			}] } } : { esbuildOptions: { plugins: [{
-				name: "vite-plugin-cloudflare:nodejs-compat-warnings-resolver",
-				setup(build$8) {
-					build$8.onResolve({ filter: nodeBuiltinsRE }, ({ path: path$1, importer }) => {
-						if (hasNodeJsAls(workerConfig) && isNodeAlsModule(path$1)) return;
-						nodeJsCompatWarningsMap.get(workerConfig)?.registerImport(path$1, importer);
-						return {
-							path: path$1,
-							external: true
-						};
-					});
-				}
-			}] } } } };
-		},
 		configResolved(resolvedViteConfig) {
 			for (const environmentName of Object.keys(resolvedViteConfig.environments)) {
 				const workerConfig = ctx.getWorkerConfig(environmentName);
@@ -26428,7 +26388,15 @@ const nodeJsCompatWarningsPlugin = createPlugin("nodejs-compat-warnings", (ctx)
 		resolveId: {
 			filter: { id: nodeBuiltinsRE },
 			handler(source, importer) {
-				return resolveId(this.environment.name, source, importer);
+				if (!nodeBuiltinsRE.test(source)) return;
+				const workerConfig = ctx.getWorkerConfig(this.environment.name);
+				assert(workerConfig, `expected workerConfig to be defined`);
+				if (hasNodeJsAls(workerConfig) && isNodeAlsModule(source)) return;
+				nodeJsCompatWarningsMap.get(workerConfig)?.registerImport(source, importer);
+				return {
+					id: source,
+					external: true
+				};
 			}
 		}
 	};