@cloudflare/vite-plugin 1.23.0 → 1.24.0

package/dist/index.mjs

@@ -1,5 +1,6 @@
 import module$1, { builtinModules, createRequire } from "node:module";
 import assert from "node:assert";
+import { randomUUID } from "node:crypto";
 import { CoreHeaders, Log, LogLevel, Miniflare, Request as Request$1, Response as Response$1, coupleWebSocket, getDefaultDevRegistryPath, getNodeCompat, getWorkerRegistry, kUnsafeEphemeralUniqueKey } from "miniflare";
 import * as wrangler from "wrangler";
 import * as nodePath from "node:path";
@@ -19,7 +20,6 @@ import { defineEnv } from "unenv";
 import * as fsp from "node:fs/promises";
 import net from "node:net";
 import { execFileSync, spawn } from "node:child_process";
-import { randomUUID } from "node:crypto";
 import path, { posix } from "path";
 import { WebSocketServer } from "ws";
 
@@ -1584,13 +1584,13 @@ function cleanUrl(url) {
 function withTrailingSlash(path$1) {
 	return path$1.endsWith("/") ? path$1 : `${path$1}/`;
 }
-function createRequestHandler(handler) {
+function createRequestHandler(ctx, handler) {
 	return async (req, res, next) => {
 		let request$1;
 		try {
 			if (req.originalUrl) req.url = req.originalUrl;
 			request$1 = createRequest(req, res);
-			let response = await handler(toMiniflareRequest(request$1), req);
+			let response = await handler(toMiniflareRequest(ctx, request$1), req);
 			if (req.httpVersionMajor === 2) {
 				response = new Response$1(response.body, response);
 				response.headers.delete("transfer-encoding");
@@ -1605,10 +1605,11 @@ function createRequestHandler(handler) {
 function satisfiesViteVersion(minVersion$2) {
 	return (0, import_gte.default)(version, minVersion$2);
 }
-function toMiniflareRequest(request$1) {
+function toMiniflareRequest(ctx, request$1) {
 	const host = request$1.headers.get("Host");
 	const xForwardedHost = request$1.headers.get("X-Forwarded-Host");
 	if (host && !xForwardedHost) request$1.headers.set("X-Forwarded-Host", host);
+	request$1.headers.set(CoreHeaders.PROXY_SHARED_SECRET, ctx.proxySharedSecret);
 	const secFetchMode = request$1.headers.get("Sec-Fetch-Mode");
 	if (secFetchMode) request$1.headers.set(CoreHeaders.SEC_FETCH_MODE, secFetchMode);
 	return new Request$1(request$1.url, {
@@ -1709,8 +1710,10 @@ var PluginContext = class {
 	#sharedContext;
 	#resolvedPluginConfig;
 	#resolvedViteConfig;
+	#proxySharedSecret;
 	constructor(sharedContext$1) {
 		this.#sharedContext = sharedContext$1;
+		this.#proxySharedSecret = randomUUID();
 	}
 	/** Creates a new Miniflare instance or updates the existing instance */
 	async startOrUpdateMiniflare(options) {
@@ -1800,6 +1803,9 @@ var PluginContext = class {
 	getNodeJsCompat(environmentName) {
 		return this.#getWorker(environmentName)?.nodeJsCompat;
 	}
+	get proxySharedSecret() {
+		return this.#proxySharedSecret;
+	}
 };
 function assertIsNotPreview(ctx) {
 	assert(ctx.resolvedPluginConfig.type !== "preview", `Expected "assets-only" or "workers" plugin config`);
@@ -5346,7 +5352,7 @@ function assertOneOf(choices, value) {
 __name(assertOneOf, "assertOneOf");
 var getC3CommandFromEnv = getEnvironmentVariableFactory({
 	variableName: "WRANGLER_C3_COMMAND",
-	defaultValue: /* @__PURE__ */ __name(() => "create cloudflare@^2.5.0", "defaultValue")
+	defaultValue: /* @__PURE__ */ __name(() => "create cloudflare", "defaultValue")
 });
 var getWranglerSendMetricsFromEnv = getBooleanEnvironmentVariableFactory({ variableName: "WRANGLER_SEND_METRICS" });
 var getWranglerSendErrorReportsFromEnv = getBooleanEnvironmentVariableFactory({ variableName: "WRANGLER_SEND_ERROR_REPORTS" });
@@ -5437,6 +5443,11 @@ var getLocalExplorerEnabledFromEnv = getBooleanEnvironmentVariableFactory({
 	variableName: "X_LOCAL_EXPLORER",
 	defaultValue: false
 });
+var getCfFetchEnabledFromEnv = getBooleanEnvironmentVariableFactory({
+	variableName: "CLOUDFLARE_CF_FETCH_ENABLED",
+	defaultValue: true
+});
+var getCfFetchPathFromEnv = getEnvironmentVariableFactory({ variableName: "CLOUDFLARE_CF_FETCH_PATH" });
 var Diagnostics = class {
 	/**
 	* Create a new Diagnostics object.
@@ -5723,6 +5734,47 @@ var friendlyBindingNames = {
 	worker_loaders: "Worker Loader",
 	vpc_services: "VPC Service"
 };
+var bindingTypeFriendlyNames = {
+	plain_text: "Environment Variable",
+	secret_text: "Environment Variable",
+	json: "Environment Variable",
+	kv_namespace: "KV Namespace",
+	send_email: "Send Email",
+	wasm_module: "Wasm Module",
+	text_blob: "Text Blob",
+	browser: "Browser",
+	ai: "AI",
+	images: "Images",
+	version_metadata: "Worker Version Metadata",
+	data_blob: "Data Blob",
+	durable_object_namespace: "Durable Object",
+	workflow: "Workflow",
+	queue: "Queue",
+	r2_bucket: "R2 Bucket",
+	d1: "D1 Database",
+	vectorize: "Vectorize Index",
+	hyperdrive: "Hyperdrive Config",
+	service: "Worker",
+	fetcher: "Service Binding",
+	analytics_engine: "Analytics Engine Dataset",
+	dispatch_namespace: "Dispatch Namespace",
+	mtls_certificate: "mTLS Certificate",
+	pipeline: "Pipeline",
+	secrets_store_secret: "Secrets Store Secret",
+	logfwdr: "logfwdr",
+	unsafe_hello_world: "Hello World",
+	ratelimit: "Rate Limit",
+	worker_loader: "Worker Loader",
+	vpc_service: "VPC Service",
+	media: "Media",
+	assets: "Assets"
+};
+function getBindingTypeFriendlyName(bindingType) {
+	if (bindingType in bindingTypeFriendlyNames) return bindingTypeFriendlyNames[bindingType];
+	if (bindingType.startsWith("unsafe_")) return "Unsafe Metadata";
+	return bindingType;
+}
+__name(getBindingTypeFriendlyName, "getBindingTypeFriendlyName");
 var ENGLISH = new Intl.ListFormat("en-US");
 var ALLOWED_INSTANCE_TYPES = [
 	"lite",
@@ -15938,7 +15990,7 @@ function parseRedirects(input, { htmlHandling = void 0, maxStaticRules = MAX_STA
 			invalid.push({ message: `Ignoring line ${i$1 + 1} as it exceeds the maximum allowed length of ${maxLineLength}.` });
 			continue;
 		}
-		const tokens = line.split(/\s+/);
+		const tokens = line.replace(/\s+#.*$/, "").split(/\s+/);
 		if (tokens.length < 2 || tokens.length > 3) {
 			invalid.push({
 				line,
@@ -21610,7 +21662,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 +21682,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"],
@@ -25982,6 +26048,7 @@ async function getDevMiniflareOptions(ctx, viteDevServer) {
 	return {
 		miniflareOptions: {
 			log: logger,
+			unsafeProxySharedSecret: ctx.proxySharedSecret,
 			logRequests: false,
 			inspectorPort: inputInspectorPort === false ? void 0 : inputInspectorPort,
 			unsafeDevRegistryPath: getDefaultDevRegistryPath(),
@@ -26086,6 +26153,7 @@ async function getPreviewMiniflareOptions(ctx, vitePreviewServer) {
 	return {
 		miniflareOptions: {
 			log: logger,
+			unsafeProxySharedSecret: ctx.proxySharedSecret,
 			inspectorPort: inputInspectorPort === false ? void 0 : inputInspectorPort,
 			unsafeDevRegistryPath: getDefaultDevRegistryPath(),
 			unsafeTriggerHandlers: true,
@@ -26226,7 +26294,7 @@ const devPlugin = createPlugin("dev", (ctx) => {
 				if (staticRouting) {
 					const excludeRulesMatcher = generateStaticRoutingRuleMatcher(staticRouting.asset_worker ?? []);
 					const includeRulesMatcher = generateStaticRoutingRuleMatcher(staticRouting.user_worker);
-					const userWorkerHandler = createRequestHandler(async (request$1) => {
+					const userWorkerHandler = createRequestHandler(ctx, async (request$1) => {
 						request$1.headers.set(CoreHeaders.ROUTE_OVERRIDE, entryWorkerName);
 						return ctx.miniflare.dispatchFetch(request$1, { redirect: "manual" });
 					});
@@ -26268,7 +26336,7 @@ const devPlugin = createPlugin("dev", (ctx) => {
 						handle: preMiddleware
 					});
 				}
-				viteDevServer.middlewares.use(createRequestHandler(async (request$1, req) => {
+				viteDevServer.middlewares.use(createRequestHandler(ctx, async (request$1, req) => {
 					if (req[kRequestType] === "asset") {
 						request$1.headers.set(CoreHeaders.ROUTE_OVERRIDE, ASSET_WORKER_NAME);
 						return ctx.miniflare.dispatchFetch(request$1, { redirect: "manual" });
@@ -26307,23 +26375,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 +26427,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 +26442,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
+				};
 			}
 		}
 	};
@@ -26464,6 +26486,7 @@ const outputConfigPlugin = createPlugin("output-config", (ctx) => {
 						directory: getAssetsDirectory(this.environment.config.build.outDir, ctx.resolvedViteConfig)
 					} : void 0
 				};
+				if (inputWorkerConfig.upload_source_maps === void 0 && this.environment.config.build.sourcemap) outputConfig.upload_source_maps = true;
 				if (inputWorkerConfig.configPath) {
 					const localDevVars = getLocalDevVarsForPreview(inputWorkerConfig.configPath, ctx.resolvedPluginConfig.cloudflareEnv);
 					if (localDevVars) this.emitFile({
@@ -26546,7 +26569,7 @@ const previewPlugin = createPlugin("preview", (ctx) => {
 			};
 		}
 		handleWebSocket(vitePreviewServer.httpServer, ctx.miniflare);
-		vitePreviewServer.middlewares.use(createRequestHandler((request$1) => {
+		vitePreviewServer.middlewares.use(createRequestHandler(ctx, (request$1) => {
 			return ctx.miniflare.dispatchFetch(request$1, { redirect: "manual" });
 		}));
 	} };
@@ -26624,7 +26647,7 @@ const triggerHandlersPlugin = createPlugin("trigger-handlers", (ctx) => {
 			const entryWorkerConfig = ctx.entryWorkerConfig;
 			if (!entryWorkerConfig) return;
 			const entryWorkerName = entryWorkerConfig.name;
-			const requestHandler = createRequestHandler((request$1) => {
+			const requestHandler = createRequestHandler(ctx, (request$1) => {
 				request$1.headers.set(CoreHeaders.ROUTE_OVERRIDE, entryWorkerName);
 				return ctx.miniflare.dispatchFetch(request$1, { redirect: "manual" });
 			});