@cloudflare/vite-plugin 1.13.13 → 1.13.15

package/dist/index.d.ts

@@ -20,8 +20,6 @@ interface AuxiliaryWorkerConfig extends BaseWorkerConfig {
 interface Experimental {
   /** Experimental support for handling the _headers and _redirects files during Vite dev mode. */
   headersAndRedirectsDevModeSupport?: boolean;
-  /** Experimental support for remote bindings (where bindings configured with `remote: true` access remote resources). */
-  remoteBindings?: boolean;
 }
 interface PluginConfig extends EntryWorkerConfig {
   auxiliaryWorkers?: AuxiliaryWorkerConfig[];

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/plugin-config.ts","../src/index.ts"],"sourcesContent":[],"mappings":";;;;;AA0BU,KANE,YAAA,GAMgB,OAAQ,GAAA;EAI1B,IAAA,EAAA,MAAA;AAA8C,CAAA;AAWxD,UAnBU,gBAAA,CAmBoB;EAAA,eAAA,CAAA,EAAA;IACV,IAAA,CAAA,EAAA,MAAA;;;UAhBV,iBAAA,SAA0B,gBAeE,CAAA;EAAiB,UAAA,CAAA,EAAA,MAAA;;UAX7C,qBAAA,SAA8B;;AC6CxC;UDzCU,YAAA,CCyCgB;;mCAAwC,CAAA,EAAA,OAAA;EAAM;;;UDlCvD,YAAA,SAAqB;qBAClB;iBACJ;;iBAEA;;;;;AAzBhB;AAAsD;AAE5B;AAI0B;AAII;AAWxD;AAA8B,iBCkCd,UAAA,CDlCc,YAAA,CAAA,ECkCW,YDlCX,CAAA,ECkC+B,IAAA,CAAK,MDlCpC,EAAA"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/plugin-config.ts","../src/index.ts"],"sourcesContent":[],"mappings":";;;;;AA0BU,KANE,YAAA,GAMgB,OAAQ,GAAA;EAI1B,IAAA,EAAA,MAAA;AAA8C,CAAA;AASxD,UAjBU,gBAAA,CAiBoB;EAAA,eAAA,CAAA,EAAA;IACV,IAAA,CAAA,EAAA,MAAA;;;UAdV,iBAAA,SAA0B,gBAaE,CAAA;EAAiB,UAAA,CAAA,EAAA,MAAA;;UAT7C,qBAAA,SAA8B;;AC+CxC;UD3CU,YAAA,CC2CgB;;mCAAwC,CAAA,EAAA,OAAA;;UDtCjD,YAAA,SAAqB;qBAClB;iBACJ;;iBAEA;;;;;AAvBhB;AAAsD;AAE5B;AAI0B;AAII;AASxD;AAA8B,iBCsCd,UAAA,CDtCc,YAAA,CAAA,ECsCW,YDtCX,CAAA,ECsC+B,IAAA,CAAK,MDtCpC,EAAA"}

package/dist/index.js

@@ -754,6 +754,7 @@ async function constructBuildCommand(options, logger) {
 	const platform = options.platform ?? "linux/amd64";
 	const buildCmd = [
 		"build",
+		"--load",
 		"-t",
 		options.tag,
 		"--platform",
@@ -957,8 +958,8 @@ const runDockerCmdWithOutput = (dockerPath, args) => {
 		throw new UserError(`Failed running docker command: ${error.message}. Command: ${dockerPath} ${args.join(" ")}`);
 	}
 };
-/** throws when docker is not installed */
-const verifyDockerInstalled = async (dockerPath, isDev = true) => {
+/** Checks whether docker is running on the system */
+const isDockerRunning = async (dockerPath) => {
 	try {
 		await runDockerCmd(dockerPath, ["info"], [
 			"inherit",
@@ -966,9 +967,14 @@ const verifyDockerInstalled = async (dockerPath, isDev = true) => {
 			"pipe"
 		]);
 	} catch {
-		throw new UserError(`The Docker CLI could not be launched. Please ensure that the Docker CLI is installed and the daemon is running.
-Other container tooling that is compatible with the Docker CLI and engine may work, but is not yet guaranteed to do so. You can specify an executable with the environment variable WRANGLER_DOCKER_BIN and a socket with DOCKER_HOST.${isDev ? "\nTo suppress this error if you do not intend on triggering any container instances, set dev.enable_containers to false in your Wrangler config or passing in --enable-containers=false." : ""}`);
+		return false;
 	}
+	return true;
+};
+/** throws when docker is not installed */
+const verifyDockerInstalled = async (dockerPath, isDev = true) => {
+	if (!await isDockerRunning(dockerPath)) throw new UserError(`The Docker CLI could not be launched. Please ensure that the Docker CLI is installed and the daemon is running.
+Other container tooling that is compatible with the Docker CLI and engine may work, but is not yet guaranteed to do so. You can specify an executable with the environment variable WRANGLER_DOCKER_BIN and a socket with DOCKER_HOST.${isDev ? "\nTo suppress this error if you do not intend on triggering any container instances, set dev.enable_containers to false in your Wrangler config or passing in --enable-containers=false." : ""}`);
 };
 function isDir(inputPath) {
 	return statSync(inputPath).isDirectory();
@@ -6886,15 +6892,18 @@ function withTrailingSlash$1(path$3) {
 }
 function createRequestHandler(handler) {
 	return async (req, res, next) => {
+		let request$1;
 		try {
 			if (req.originalUrl) req.url = req.originalUrl;
-			let response = await handler(toMiniflareRequest(createRequest(req, res)), req);
+			request$1 = createRequest(req, res);
+			let response = await handler(toMiniflareRequest(request$1), req);
 			if (req.httpVersionMajor === 2) {
 				response = new Response$1(response.body, response);
 				response.headers.delete("transfer-encoding");
 			}
 			await sendResponse(res, response);
 		} catch (error) {
+			if (request$1?.signal.aborted) return;
 			next(error);
 		}
 	};
@@ -6909,7 +6918,8 @@ function toMiniflareRequest(request$1) {
 		method: request$1.method,
 		headers: [["accept-encoding", "identity"], ...request$1.headers],
 		body: request$1.body,
-		duplex: "half"
+		duplex: "half",
+		signal: request$1.signal
 	});
 }
 
@@ -8469,10 +8479,10 @@ async function getDevMiniflareOptions(config) {
 	const workersFromConfig = resolvedPluginConfig.type === "workers" ? await Promise.all(Object.entries(resolvedPluginConfig.workers).map(async ([environmentName, workerConfig]) => {
 		const bindings = unstable_convertConfigBindingsToStartWorkerBindings(workerConfig);
 		const preExistingRemoteProxySession = workerConfig.configPath ? remoteProxySessionsDataMap.get(workerConfig.configPath) : void 0;
-		const remoteProxySessionData = resolvedPluginConfig.experimental.remoteBindings ?? true ? await maybeStartOrUpdateRemoteProxySession({
+		const remoteProxySessionData = await maybeStartOrUpdateRemoteProxySession({
 			name: workerConfig.name,
 			bindings: bindings ?? {}
-		}, preExistingRemoteProxySession ?? null) : void 0;
+		}, preExistingRemoteProxySession ?? null);
 		if (workerConfig.configPath && remoteProxySessionData) remoteProxySessionsDataMap.set(workerConfig.configPath, remoteProxySessionData);
 		let containerBuildId;
 		if (workerConfig.containers?.length && workerConfig.dev.enable_containers) {
@@ -8491,7 +8501,6 @@ async function getDevMiniflareOptions(config) {
 			assets: void 0
 		}, resolvedPluginConfig.cloudflareEnv, {
 			remoteProxyConnectionString: remoteProxySessionData?.session?.remoteProxyConnectionString,
-			remoteBindingsEnabled: resolvedPluginConfig.experimental.remoteBindings ?? true,
 			containerBuildId
 		});
 		const { externalWorkers: externalWorkers$1 } = miniflareWorkerOptions;
@@ -8547,11 +8556,7 @@ async function getDevMiniflareOptions(config) {
 			inspectorPort: inspectorPort === false ? void 0 : inspectorPort,
 			unsafeDevRegistryPath: getDefaultDevRegistryPath(),
 			unsafeTriggerHandlers: true,
-			handleRuntimeStdio(stdout, stderr) {
-				const decoder = new TextDecoder();
-				stdout.forEach((data$1) => logger.info(decoder.decode(data$1)));
-				stderr.forEach((error) => logger.logWithLevel(LogLevel.ERROR, decoder.decode(error)));
-			},
+			handleStructuredLogs: getStructuredLogsLogger(logger),
 			defaultPersistRoot: getPersistenceRoot(resolvedViteConfig.root, resolvedPluginConfig.persistState),
 			workers: [
 				...assetWorkers,
@@ -8645,10 +8650,10 @@ async function getPreviewMiniflareOptions(config) {
 	const workers = (await Promise.all(resolvedPluginConfig.workers.map(async (workerConfig, i$1) => {
 		const bindings = unstable_convertConfigBindingsToStartWorkerBindings(workerConfig);
 		const preExistingRemoteProxySessionData = workerConfig.configPath ? remoteProxySessionsDataMap.get(workerConfig.configPath) : void 0;
-		const remoteProxySessionData = resolvedPluginConfig.experimental.remoteBindings ?? true ? await maybeStartOrUpdateRemoteProxySession({
+		const remoteProxySessionData = await maybeStartOrUpdateRemoteProxySession({
 			name: workerConfig.name,
 			bindings: bindings ?? {}
-		}, preExistingRemoteProxySessionData ?? null) : void 0;
+		}, preExistingRemoteProxySessionData ?? null);
 		if (workerConfig.configPath && remoteProxySessionData) remoteProxySessionsDataMap.set(workerConfig.configPath, remoteProxySessionData);
 		let containerBuildId;
 		if (workerConfig.containers?.length && workerConfig.dev.enable_containers) {
@@ -8664,7 +8669,6 @@ async function getPreviewMiniflareOptions(config) {
 		}
 		const miniflareWorkerOptions = unstable_getMiniflareWorkerOptions(workerConfig, void 0, {
 			remoteProxyConnectionString: remoteProxySessionData?.session?.remoteProxyConnectionString,
-			remoteBindingsEnabled: resolvedPluginConfig.experimental.remoteBindings ?? true,
 			containerBuildId
 		});
 		const { externalWorkers } = miniflareWorkerOptions;
@@ -8691,11 +8695,7 @@ async function getPreviewMiniflareOptions(config) {
 			inspectorPort: inspectorPort === false ? void 0 : inspectorPort,
 			unsafeDevRegistryPath: getDefaultDevRegistryPath(),
 			unsafeTriggerHandlers: true,
-			handleRuntimeStdio(stdout, stderr) {
-				const decoder = new TextDecoder();
-				stdout.forEach((data$1) => logger.info(decoder.decode(data$1)));
-				stderr.forEach((error) => logger.logWithLevel(LogLevel.ERROR, decoder.decode(error)));
-			},
+			handleStructuredLogs: getStructuredLogsLogger(logger),
 			defaultPersistRoot: getPersistenceRoot(resolvedViteConfig.root, resolvedPluginConfig.persistState),
 			workers
 		},
@@ -8728,6 +8728,19 @@ function miniflareLogLevelFromViteLogLevel(level = "info") {
 		case "silent": return LogLevel.NONE;
 	}
 }
+/**
+* Generates a log handler to be passed as the `handleStructuredLogs` option to miniflare
+*
+* @param logger the vite logger to use
+* @returns the log handler to pass to miniflare
+*/
+function getStructuredLogsLogger(logger) {
+	return ({ level, message }) => {
+		if (level === "warn") return logger.warn(message);
+		if (level === "error") return logger.logWithLevel(LogLevel.ERROR, message);
+		return logger.info(message);
+	};
+}
 
 //#endregion
 //#region ../workers-shared/utils/configuration/parseStaticRouting.ts
@@ -15710,6 +15723,8 @@ function handleWebSocket(httpServer, getFetcher) {
 //#region src/index.ts
 const debuglog = util.debuglog("@cloudflare:vite-plugin");
 let workersConfigsWarningShown = false;
+/** Used to track whether hooks are being called because of a server restart or a server close event. */
+let restartingServer = false;
 let miniflare;
 /**
 * Vite plugin that enables a full-featured integration between Vite and the Cloudflare Workers runtime.
@@ -15721,8 +15736,6 @@ let miniflare;
 function cloudflare(pluginConfig = {}) {
 	const ctx = new PluginContext();
 	let containerImageTagsSeen = /* @__PURE__ */ new Set();
-	/** Used to track whether hooks are being called because of a server restart or a server close event. */
-	let restartingServer = false;
 	return [
 		{
 			name: "vite-plugin-cloudflare",