@cloudflare/vite-plugin 2.0.0-beta.v.0 → 2.0.0-beta.v.2

package/dist/index.mjs

@@ -50144,7 +50144,7 @@ function mapWorkerMetadataBindings(bindings) {
 	}, {});
 }
 __name$3(mapWorkerMetadataBindings, "mapWorkerMetadataBindings");
-var DEFAULT_COMPAT_DATE = "2026-10-12";
+var DEFAULT_COMPAT_DATE = "2026-10-19";
 function constructWranglerConfig(config$3) {
 	const mappedBindings = mapWorkerMetadataBindings(config$3.bindings);
 	const durableObjectClassNames = config$3.bindings.filter((binding) => binding.type === "durable_object_namespace" && binding.script_name === config$3.name).map((durableObject) => durableObject.class_name);
@@ -52249,50 +52249,6 @@ The local dev server started at ${origin.href}
 	return new Error(errorMessage);
 }
 __name$3(createTunnelStartupError, "createTunnelStartupError");
-var WRANGLER_COMMANDS = {
-	deploy: "wrangler deploy",
-	preview: "wrangler preview",
-	versionsUpload: "wrangler versions upload",
-	versionsDeploy: "wrangler versions deploy",
-	versionsDeployAt: /* @__PURE__ */ __name$3((n2) => `wrangler versions deploy <new-version-id>@${n2}%`, "versionsDeployAt"),
-	triggersDeploy: "wrangler triggers deploy",
-	d1List: "wrangler d1 list",
-	d1Delete: "wrangler d1 delete",
-	queuesCreate: "wrangler queues create",
-	secretPut: "wrangler secret put",
-	versionsSecretPut: "wrangler versions secret put",
-	containerRegistryConfigure: "wrangler containers registries configure"
-};
-var WRANGLER_CONFIG_FIELDS = {
-	workersDev: "workers_dev",
-	containerObservabilityTargetPercentage: "target_instance_percentage",
-	containerObservabilityTargetCount: "target_instance_count"
-};
-var WRANGLER_CLI_PRESENTATION = {
-	cliName: "wrangler",
-	displayName: "Wrangler",
-	displayConfigFileName: "Wrangler config file",
-	configFieldAssignmentSeparator: " = ",
-	commands: WRANGLER_COMMANDS,
-	configFields: WRANGLER_CONFIG_FIELDS
-};
-function resolveCliPresentation(overrides) {
-	return {
-		cliName: overrides?.cliName ?? WRANGLER_CLI_PRESENTATION.cliName,
-		displayName: overrides?.displayName ?? WRANGLER_CLI_PRESENTATION.displayName,
-		displayConfigFileName: overrides?.displayConfigFileName ?? WRANGLER_CLI_PRESENTATION.displayConfigFileName,
-		configFieldAssignmentSeparator: overrides?.configFieldAssignmentSeparator ?? WRANGLER_CLI_PRESENTATION.configFieldAssignmentSeparator,
-		commands: {
-			...WRANGLER_COMMANDS,
-			...overrides?.commands
-		},
-		configFields: {
-			...WRANGLER_CONFIG_FIELDS,
-			...overrides?.configFields
-		}
-	};
-}
-__name$3(resolveCliPresentation, "resolveCliPresentation");
 var UPDATE_CHECK_TIMEOUT_MS = 3e3;
 var CACHE_TTL_MS = 3600 * 1e3;
 var NPM_REGISTRY_URL = "https://registry.npmjs.org/";
@@ -75691,9 +75647,7 @@ var fetchResult$1 = /* @__PURE__ */ __name$2(() => {
 var fetchPagedListResult = /* @__PURE__ */ __name$2(() => {
 	throw new Error("initContainersSharedContext() must be called first");
 }, "fetchPagedListResult");
-var cliPresentation = resolveCliPresentation();
 function initContainersSharedContext(ctx) {
-	cliPresentation = resolveCliPresentation(ctx.cliPresentation);
 	logger$1 = ctx.logger;
 	fetchResult$1 = ctx.fetchResult;
 	if (ctx.fetchPagedListResult !== void 0) fetchPagedListResult = ctx.fetchPagedListResult;
@@ -75950,7 +75904,7 @@ async function pullEgressInterceptorImage(dockerPath) {
 	await runDockerCmd(dockerPath, args);
 }
 __name$2(pullEgressInterceptorImage, "pullEgressInterceptorImage");
-async function pullImage(dockerPath, options, logger2, complianceConfig) {
+async function pullImage(dockerPath, options, logger2, complianceConfig, registryConfigureCommand) {
 	const domain$1 = new URL(`http://${options.image_uri}`).hostname;
 	const isExternalRegistry = domain$1 !== getCloudflareContainerRegistry(complianceConfig);
 	try {
@@ -75958,7 +75912,7 @@ async function pullImage(dockerPath, options, logger2, complianceConfig) {
 	} catch (e) {
 		if (!isExternalRegistry) throw e;
 		logger2?.warn(`Unable to retrieve configured registry credentials from Cloudflare.
-Unless this is a public image, you will need to run \`${cliPresentation.commands.containerRegistryConfigure}\` before deploying.
+Unless this is a public image, you will need to run \`${registryConfigureCommand}\` before deploying.
 Attempting to pull image anyway...`);
 	}
 	const pull = runDockerCmd(dockerPath, [
@@ -75991,7 +75945,7 @@ async function prepareContainerImagesForDev(args) {
 		dockerPath,
 		operation: "running dev",
 		imageNoun: containerOptions.length !== 1 ? "the configured images" : "the configured image",
-		hint: `To suppress this error if you do not intend on triggering any container instances, set dev.enable_containers to false in your ${cliPresentation.displayConfigFileName} or pass --enable-containers=false.`
+		hint: `To suppress this error if you do not intend on triggering any container instances, set dev.enable_containers to false in your ${args.configFileName} or pass --enable-containers=false.`
 	});
 	for (const options of containerOptions) {
 		if ("dockerfile" in options) {
@@ -76016,7 +75970,7 @@ async function prepareContainerImagesForDev(args) {
 			await build.ready;
 			onContainerImagePreparationEnd({ containerOptions: options });
 		} else {
-			const pull = await pullImage(dockerPath, options, args.logger, args.complianceConfig);
+			const pull = await pullImage(dockerPath, options, args.logger, args.complianceConfig, args.registryConfigureCommand);
 			onContainerImagePreparationStart({
 				containerOptions: options,
 				abort: /* @__PURE__ */ __name$2(() => {
@@ -77134,7 +77088,7 @@ function createDurableObjectNamespaceResolver(config$3, { versionId, accountId,
 	};
 }
 __name$2(createDurableObjectNamespaceResolver, "createDurableObjectNamespaceResolver");
-async function deployContainers(config$3, containerDeployments, { versionId, accountId, scriptName, dispatchNamespace }) {
+async function deployContainers(config$3, containerDeployments, { versionId, accountId, scriptName, dispatchNamespace, configFileName: configFileName$1, observabilityTargetPercentageField, observabilityTargetCountField }) {
 	const resolveNamespaceId = createDurableObjectNamespaceResolver(config$3, {
 		versionId,
 		accountId,
@@ -77143,7 +77097,10 @@ async function deployContainers(config$3, containerDeployments, { versionId, acc
 	});
 	for (const { container, imageRef } of containerDeployments) await apply({
 		imageRef,
-		durable_object_namespace_id: await resolveNamespaceId(container.class_name)
+		durable_object_namespace_id: await resolveNamespaceId(container.class_name),
+		configFileName: configFileName$1,
+		observabilityTargetPercentageField,
+		observabilityTargetCountField
 	}, container, config$3, accountId);
 }
 __name$2(deployContainers, "deployContainers");
@@ -77287,10 +77244,10 @@ function buildApplicationObservabilityPatch(observability, writeTarget, prevApp)
 	return nextTopLevelObservability !== void 0 ? { observability: nextTopLevelObservability } : {};
 }
 __name$2(buildApplicationObservabilityPatch, "buildApplicationObservabilityPatch");
-function assertCanUseApplicationObservabilityTargeting(prevApp, containerConfig) {
+function assertCanUseApplicationObservabilityTargeting(prevApp, containerConfig, options) {
 	if (!hasTopLevelOnlyObservabilityFields(containerConfig.observability)) return;
 	if (!hasLegacyRolloutObservabilityEnabled(prevApp)) return;
-	throw new UserError(`Application-level observability targeting cannot be enabled for container ${containerConfig.name} while it still uses legacy rollout-based observability. Set containers[].observability.enabled = false in your ${cliPresentation.displayConfigFileName} and deploy once, then deploy again with ${cliPresentation.configFields.containerObservabilityTargetPercentage} or ${cliPresentation.configFields.containerObservabilityTargetCount}.`, { telemetryMessage: "containers deploy observability migration blocked" });
+	throw new UserError(`Application-level observability targeting cannot be enabled for container ${containerConfig.name} while it still uses legacy rollout-based observability. Set containers[].observability.enabled = false in your ${options.configFileName} and deploy once, then deploy again with ${options.observabilityTargetPercentageField} or ${options.observabilityTargetCountField}.`, { telemetryMessage: "containers deploy observability migration blocked" });
 }
 __name$2(assertCanUseApplicationObservabilityTargeting, "assertCanUseApplicationObservabilityTargeting");
 function hasRolloutDiff(prevApp, nextApp) {
@@ -77363,7 +77320,7 @@ async function apply(args, containerConfig, config$3, accountId) {
 		}
 	}
 	const observabilityWriteTarget = selectObservabilityWriteTarget(prevApp);
-	if (prevApp !== void 0) assertCanUseApplicationObservabilityTargeting(prevApp, containerConfig);
+	if (prevApp !== void 0) assertCanUseApplicationObservabilityTargeting(prevApp, containerConfig, args);
 	const appConfig = stripUndefined(mergeIfUnsafe(config$3, containerConfigToCreateRequest(accountId, containerConfig, imageRef, args.durable_object_namespace_id, config$3, observabilityWriteTarget, prevApp), containerConfig.name));
 	if (prevApp !== void 0 && prevApp !== null) {
 		const normalisedPrevApp = sortObjectRecursive(stripUndefined(cleanApplicationFromAPI(prevApp, containerConfig, accountId, observabilityWriteTarget, config$3)));
@@ -77726,7 +77683,7 @@ __toESM(require_sender());
 __toESM(require_subprotocol());
 var import_websocket = __toESM(require_websocket());
 __toESM(require_websocket_server());
-async function sshCommand(sshArgs) {
+async function sshCommand(sshArgs, userAgent) {
 	const useStdio = shouldUseStdio(sshArgs);
 	let sshResponse;
 	try {
@@ -77743,7 +77700,7 @@ async function sshCommand(sshArgs) {
 	}
 	const ws = new import_websocket.default(sshResponse.url, { headers: {
 		authorization: `Bearer ${sshResponse.token}`,
-		"user-agent": cliPresentation.cliName
+		"user-agent": userAgent
 	} });
 	ws.binaryType = "arraybuffer";
 	if (useStdio) {
@@ -87604,7 +87561,9 @@ async function prepareContainerImagesForVite(options) {
 		onContainerImagePreparationStart: () => {},
 		onContainerImagePreparationEnd: () => {},
 		logger: options.logger,
-		complianceConfig
+		complianceConfig,
+		configFileName: "cloudflare.config.ts",
+		registryConfigureCommand: options.cliDisplayName === "cf" ? "cf containers registries create" : "wrangler containers registries configure"
 	});
 }
 
@@ -88427,7 +88386,7 @@ __name(createWorkerUploadForm, "createWorkerUploadForm");
 //#endregion
 //#region ../remote-bindings/dist/index.mjs
 var import_undici = require_undici();
-var version$1 = "0.0.48";
+var version$1 = "0.0.50";
 var NoDefaultValueProvided = class extends UserError {
 	constructor() {
 		super("This command cannot be run in a non-interactive context", { telemetryMessage: "remote bindings prompt default missing" });
@@ -88482,7 +88441,7 @@ let logger;
 function initLogger(value) {
 	logger = value;
 }
-var ProxyWorker_default = "// src/startDevWorker/utils.ts\nimport assert from \"node:assert\";\nvar PREVIEW_TOKEN_REFRESH_INTERVAL = 50 * 60 * 1e3;\nfunction createDeferred(previousDeferred) {\n  let resolve, reject;\n  const newPromise = new Promise((_resolve, _reject) => {\n    resolve = _resolve;\n    reject = _reject;\n  });\n  assert(resolve);\n  assert(reject);\n  previousDeferred?.resolve(newPromise);\n  return {\n    promise: newPromise,\n    resolve,\n    reject\n  };\n}\nfunction urlFromParts(parts, base = \"http://localhost\") {\n  const url = new URL(base);\n  Object.assign(url, parts);\n  return url;\n}\nfunction rewriteUrlInHeaderValue(value, from, to) {\n  return value.replace(\n    /(https?:\\/\\/[^/?#\\s,;\"']+)([^\\s,;\"']*)/gi,\n    (match, origin, rest) => {\n      let url;\n      try {\n        url = new URL(origin);\n      } catch {\n        return match;\n      }\n      if (url.host !== from.host) {\n        return match;\n      }\n      return to.origin + rest;\n    }\n  );\n}\n\n// templates/startDevWorker/ProxyWorker.ts\nvar ProxyWorker_default = {\n  fetch(req, env) {\n    const singleton = env.DURABLE_OBJECT.idFromName(\"\");\n    const inspectorProxy = env.DURABLE_OBJECT.get(singleton);\n    return inspectorProxy.fetch(req);\n  }\n};\nvar ProxyWorker = class {\n  constructor(_state, env) {\n    this.env = env;\n  }\n  env;\n  proxyData;\n  requestQueue = /* @__PURE__ */ new Map();\n  requestRetryQueue = /* @__PURE__ */ new Map();\n  fetch(request) {\n    if (isRequestFromProxyController(request, this.env)) {\n      return this.processProxyControllerRequest(request);\n    }\n    const deferred = createDeferred();\n    this.requestQueue.set(request, deferred);\n    this.processQueue();\n    return deferred.promise;\n  }\n  processProxyControllerRequest(request) {\n    const event = request.cf?.hostMetadata;\n    switch (event?.type) {\n      case \"pause\":\n        this.proxyData = void 0;\n        break;\n      case \"play\":\n        this.proxyData = event.proxyData;\n        this.processQueue();\n        break;\n    }\n    return new Response(null, { status: 204 });\n  }\n  /**\n   * Process requests that are being retried first, then process newer requests.\n   * Requests that are being retried are, by definition, older than requests which haven't been processed yet.\n   * We don't need to be more accurate than this re ordering, since the requests are being fired off synchronously.\n   */\n  *getOrderedQueue() {\n    yield* this.requestRetryQueue;\n    yield* this.requestQueue;\n  }\n  processQueue() {\n    const { proxyData } = this;\n    if (proxyData === void 0) {\n      return;\n    }\n    for (const [request, deferredResponse] of this.getOrderedQueue()) {\n      this.requestRetryQueue.delete(request);\n      this.requestQueue.delete(request);\n      const outerUrl = new URL(request.url);\n      const headers = new Headers(request.headers);\n      const userWorkerUrl = new URL(request.url);\n      Object.assign(userWorkerUrl, proxyData.userWorkerUrl);\n      const innerUrl = urlFromParts(\n        proxyData.userWorkerInnerUrlOverrides ?? {},\n        request.url\n      );\n      const encoding = request.cf?.clientAcceptEncoding;\n      if (encoding !== void 0) {\n        headers.set(\"Accept-Encoding\", encoding);\n      }\n      rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);\n      headers.set(\"MF-Original-URL\", innerUrl.href);\n      for (const [key, value] of Object.entries(proxyData.headers ?? {})) {\n        if (value === void 0) {\n          continue;\n        }\n        if (key.toLowerCase() === \"cookie\") {\n          const existing = request.headers.get(\"cookie\") ?? \"\";\n          headers.set(\"cookie\", `${existing};${value}`);\n        } else {\n          headers.set(key, value);\n        }\n      }\n      void fetch(userWorkerUrl, new Request(request, { headers })).then(async (res) => {\n        res = new Response(res.body, res);\n        rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);\n        await checkForPreviewTokenError(res, this.env, proxyData);\n        deferredResponse.resolve(res);\n      }).catch((error) => {\n        const newUserWorkerUrl = this.proxyData && urlFromParts(this.proxyData.userWorkerUrl);\n        if (userWorkerUrl.href === newUserWorkerUrl?.href) {\n          void sendMessageToProxyController(this.env, {\n            type: \"error\",\n            error: {\n              name: error.name,\n              message: error.message,\n              stack: error.stack,\n              cause: error.cause\n            }\n          });\n          deferredResponse.reject(error);\n        } else if (request.method === \"GET\" || request.method === \"HEAD\") {\n          this.requestRetryQueue.set(request, deferredResponse);\n        } else {\n          deferredResponse.resolve(\n            new Response(\n              \"Your worker restarted mid-request. Please try sending the request again. Only GET or HEAD requests are retried automatically.\",\n              {\n                status: 503,\n                headers: { \"Retry-After\": \"0\" }\n              }\n            )\n          );\n        }\n      });\n    }\n  }\n};\nfunction isRequestFromProxyController(req, env) {\n  return req.headers.get(\"Authorization\") === env.PROXY_CONTROLLER_AUTH_SECRET;\n}\nfunction sendMessageToProxyController(env, message) {\n  return env.PROXY_CONTROLLER.fetch(\"http://dummy\", {\n    method: \"POST\",\n    body: JSON.stringify(message)\n  });\n}\nasync function checkForPreviewTokenError(response, env, proxyData) {\n  if (response.status !== 400) {\n    return;\n  }\n  const clone = response.clone();\n  const text = await clone.text();\n  if (text.includes(\"Invalid Workers Preview configuration\") || text.includes(\"error code: 1031\")) {\n    void sendMessageToProxyController(env, {\n      type: \"previewTokenExpired\",\n      proxyData\n    });\n  }\n}\nfunction rewriteUrlRelatedHeaders(headers, from, to) {\n  const setCookie = headers.getAll(\"Set-Cookie\");\n  headers.delete(\"Set-Cookie\");\n  headers.forEach((value, key) => {\n    if (typeof value === \"string\" && value.includes(from.host)) {\n      headers.set(key, rewriteUrlInHeaderValue(value, from, to));\n    }\n  });\n  for (const cookie of setCookie) {\n    headers.append(\n      \"Set-Cookie\",\n      cookie.replace(\n        new RegExp(`Domain=${from.hostname}($|;|,)`),\n        `Domain=${to.hostname}$1`\n      )\n    );\n  }\n}\nexport {\n  ProxyWorker,\n  ProxyWorker_default as default\n};\n";
+var ProxyWorker_default = "// src/startDevWorker/utils.ts\nimport assert from \"node:assert\";\nvar PREVIEW_TOKEN_REFRESH_INTERVAL = 50 * 60 * 1e3;\nvar PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL = 60 * 1e3;\nfunction createDeferred(previousDeferred) {\n  let resolve, reject;\n  const newPromise = new Promise((_resolve, _reject) => {\n    resolve = _resolve;\n    reject = _reject;\n  });\n  assert(resolve);\n  assert(reject);\n  previousDeferred?.resolve(newPromise);\n  return {\n    promise: newPromise,\n    resolve,\n    reject\n  };\n}\nfunction urlFromParts(parts, base = \"http://localhost\") {\n  const url = new URL(base);\n  Object.assign(url, parts);\n  return url;\n}\nfunction rewriteUrlInHeaderValue(value, from, to) {\n  return value.replace(\n    /(https?:\\/\\/[^/?#\\s,;\"']+)([^\\s,;\"']*)/gi,\n    (match, origin, rest) => {\n      let url;\n      try {\n        url = new URL(origin);\n      } catch {\n        return match;\n      }\n      if (url.host !== from.host) {\n        return match;\n      }\n      return to.origin + rest;\n    }\n  );\n}\n\n// templates/startDevWorker/ProxyWorker.ts\nvar ProxyWorker_default = {\n  fetch(req, env) {\n    const singleton = env.DURABLE_OBJECT.idFromName(\"\");\n    const inspectorProxy = env.DURABLE_OBJECT.get(singleton);\n    return inspectorProxy.fetch(req);\n  }\n};\nvar ProxyWorker = class {\n  constructor(_state, env) {\n    this.env = env;\n  }\n  env;\n  proxyData;\n  requestQueue = /* @__PURE__ */ new Map();\n  requestRetryQueue = /* @__PURE__ */ new Map();\n  fetch(request) {\n    if (isRequestFromProxyController(request, this.env)) {\n      return this.processProxyControllerRequest(request);\n    }\n    const deferred = createDeferred();\n    this.requestQueue.set(request, deferred);\n    this.processQueue();\n    return deferred.promise;\n  }\n  processProxyControllerRequest(request) {\n    const event = request.cf?.hostMetadata;\n    switch (event?.type) {\n      case \"pause\":\n        this.proxyData = void 0;\n        break;\n      case \"play\":\n        this.proxyData = event.proxyData;\n        this.processQueue();\n        break;\n    }\n    return new Response(null, { status: 204 });\n  }\n  /**\n   * Process requests that are being retried first, then process newer requests.\n   * Requests that are being retried are, by definition, older than requests which haven't been processed yet.\n   * We don't need to be more accurate than this re ordering, since the requests are being fired off synchronously.\n   */\n  *getOrderedQueue() {\n    yield* this.requestRetryQueue;\n    yield* this.requestQueue;\n  }\n  processQueue() {\n    const { proxyData } = this;\n    if (proxyData === void 0) {\n      return;\n    }\n    for (const [request, deferredResponse] of this.getOrderedQueue()) {\n      this.requestRetryQueue.delete(request);\n      this.requestQueue.delete(request);\n      const outerUrl = new URL(request.url);\n      const headers = new Headers(request.headers);\n      const userWorkerUrl = new URL(request.url);\n      Object.assign(userWorkerUrl, proxyData.userWorkerUrl);\n      const innerUrl = urlFromParts(\n        proxyData.userWorkerInnerUrlOverrides ?? {},\n        request.url\n      );\n      const encoding = request.cf?.clientAcceptEncoding;\n      if (encoding !== void 0) {\n        headers.set(\"Accept-Encoding\", encoding);\n      }\n      rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);\n      headers.set(\"MF-Original-URL\", innerUrl.href);\n      for (const [key, value] of Object.entries(proxyData.headers ?? {})) {\n        if (value === void 0) {\n          continue;\n        }\n        if (key.toLowerCase() === \"cookie\") {\n          const existing = request.headers.get(\"cookie\") ?? \"\";\n          headers.set(\"cookie\", `${existing};${value}`);\n        } else {\n          headers.set(key, value);\n        }\n      }\n      void fetch(userWorkerUrl, new Request(request, { headers })).then(async (res) => {\n        res = new Response(res.body, res);\n        rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);\n        await checkForPreviewTokenError(res, this.env, proxyData);\n        deferredResponse.resolve(res);\n      }).catch((error) => {\n        const newUserWorkerUrl = this.proxyData && urlFromParts(this.proxyData.userWorkerUrl);\n        if (userWorkerUrl.href === newUserWorkerUrl?.href) {\n          void sendMessageToProxyController(this.env, {\n            type: \"error\",\n            error: {\n              name: error.name,\n              message: error.message,\n              stack: error.stack,\n              cause: error.cause\n            }\n          });\n          deferredResponse.reject(error);\n        } else if (request.method === \"GET\" || request.method === \"HEAD\") {\n          this.requestRetryQueue.set(request, deferredResponse);\n        } else {\n          deferredResponse.resolve(\n            new Response(\n              \"Your worker restarted mid-request. Please try sending the request again. Only GET or HEAD requests are retried automatically.\",\n              {\n                status: 503,\n                headers: { \"Retry-After\": \"0\" }\n              }\n            )\n          );\n        }\n      });\n    }\n  }\n};\nfunction isRequestFromProxyController(req, env) {\n  return req.headers.get(\"Authorization\") === env.PROXY_CONTROLLER_AUTH_SECRET;\n}\nfunction sendMessageToProxyController(env, message) {\n  return env.PROXY_CONTROLLER.fetch(\"http://dummy\", {\n    method: \"POST\",\n    body: JSON.stringify(message)\n  });\n}\nasync function checkForPreviewTokenError(response, env, proxyData) {\n  if (response.status !== 400) {\n    return;\n  }\n  const clone = response.clone();\n  const text = await clone.text();\n  if (text.includes(\"Invalid Workers Preview configuration\") || text.includes(\"error code: 1031\")) {\n    void sendMessageToProxyController(env, {\n      type: \"previewTokenExpired\",\n      proxyData\n    });\n  }\n}\nfunction rewriteUrlRelatedHeaders(headers, from, to) {\n  const setCookie = headers.getAll(\"Set-Cookie\");\n  headers.delete(\"Set-Cookie\");\n  headers.forEach((value, key) => {\n    if (typeof value === \"string\" && value.includes(from.host)) {\n      headers.set(key, rewriteUrlInHeaderValue(value, from, to));\n    }\n  });\n  for (const cookie of setCookie) {\n    headers.append(\n      \"Set-Cookie\",\n      cookie.replace(\n        new RegExp(`Domain=${from.hostname}($|;|,)`),\n        `Domain=${to.hostname}$1`\n      )\n    );\n  }\n}\nexport {\n  ProxyWorker,\n  ProxyWorker_default as default\n};\n";
 function castLogLevel(level) {
 	let key = level.toUpperCase();
 	if (key === "LOG") key = "INFO";
@@ -88515,6 +88474,15 @@ function castErrorCause(cause) {
 * Preview tokens expire after 1 hour (hardcoded in the Workers control plane), so we retry after 50 mins.
 */
 const PREVIEW_TOKEN_REFRESH_INTERVAL = 3e3 * 1e3;
+/**
+* How soon to try again after a proactive preview token refresh fails (e.g.
+* the machine is offline). A failed refresh must not give up the retry cycle
+* for good — otherwise a network outage longer than the API's own few quick
+* retries (see `retryOnAPIFailure`) permanently strands the session even
+* after connectivity returns, since nothing else re-triggers a refresh
+* attempt for a long-lived session like `getPlatformProxy()`'s.
+*/
+const PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL = 60 * 1e3;
 function createDeferred(previousDeferred) {
 	let resolve$3, reject;
 	const newPromise = new Promise((_resolve$1, _reject) => {
@@ -88930,6 +88898,7 @@ var RemoteRuntimeController = class {
 	#latestBundle;
 	#latestProxyData;
 	#refreshTimer;
+	#sessionCreatedAt;
 	#tearingDown = false;
 	constructor(onError$1, onReloadComplete) {
 		this.onError = onError$1;
@@ -88937,7 +88906,9 @@ var RemoteRuntimeController = class {
 	}
 	async #previewSession(props) {
 		try {
-			return await retryOnAPIFailure(() => createPreviewSession(props.complianceConfig, props, this.#abortController.signal, props.name, props.cliDisplayName), logger, void 0, void 0, this.#abortController.signal);
+			const session = await retryOnAPIFailure(() => createPreviewSession(props.complianceConfig, props, this.#abortController.signal, props.name, props.cliDisplayName), logger, void 0, void 0, this.#abortController.signal);
+			if (session) this.#sessionCreatedAt = Date.now();
+			return session;
 		} catch (err) {
 			if (err instanceof Error && err.name == "AbortError") return;
 			handlePreviewSessionCreationError(err, props.accountId);
@@ -89042,9 +89013,13 @@ var RemoteRuntimeController = class {
 	}
 	#scheduleRefresh(interval) {
 		clearTimeout(this.#refreshTimer);
+		const delay = interval === PREVIEW_TOKEN_REFRESH_INTERVAL && this.#sessionCreatedAt !== void 0 ? Math.max(0, PREVIEW_TOKEN_REFRESH_INTERVAL - (Date.now() - this.#sessionCreatedAt)) : interval;
 		this.#refreshTimer = setTimeout(() => {
+			this.#refreshTimer = void 0;
 			if (this.#latestProxyData) this.onPreviewTokenExpired();
-		}, interval);
+			else if (!this.#tearingDown) this.#scheduleRefresh(PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL);
+		}, delay);
+		this.#refreshTimer.unref?.();
 	}
 	async #onBundleComplete({ config: config$3, bundle }, id) {
 		if (id !== this.#currentBundleId) return;
@@ -89072,10 +89047,14 @@ var RemoteRuntimeController = class {
 			logger.warn("Cannot refresh preview token: missing config or bundle data");
 			return;
 		}
+		const bundleId = this.#currentBundleId;
+		const abortSignal = this.#abortController.signal;
+		const shouldRetry = () => bundleId === this.#currentBundleId && !abortSignal.aborted && !this.#tearingDown;
 		try {
 			const auth = await unwrapHook(this.#latestConfig.auth);
 			this.#session = await this.#getPreviewSession(this.#latestConfig, auth);
-			if (await this.#updatePreviewToken(this.#latestConfig, this.#latestBundle, auth, this.#currentBundleId)) logger.log(source_default.green("✔ Preview token refreshed successfully"));
+			if (await this.#updatePreviewToken(this.#latestConfig, this.#latestBundle, auth, bundleId)) logger.log(source_default.green("✔ Preview token refreshed successfully"));
+			else if (shouldRetry()) this.#scheduleRefresh(PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL);
 		} catch (error$3) {
 			if (error$3 instanceof Error && error$3.name == "AbortError") return;
 			this.emitErrorEvent({
@@ -89085,12 +89064,13 @@ var RemoteRuntimeController = class {
 				source: "RemoteRuntimeController",
 				data: void 0
 			});
+			if (shouldRetry()) this.#scheduleRefresh(PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL);
 		}
 	}
 	onUpdateStart() {
 		this.#abortController.abort();
 		this.#abortController = new AbortController();
-		clearTimeout(this.#refreshTimer);
+		if (!this.#refreshTimer && this.#latestProxyData && !this.#tearingDown) this.#scheduleRefresh(PREVIEW_TOKEN_REFRESH_RETRY_INTERVAL);
 	}
 	onBundleComplete(ev) {
 		const id = ++this.#currentBundleId;
@@ -89695,7 +89675,7 @@ function createRemoteBindingsLogger(logger$2) {
 }
 function getWorkerZone(config$3) {
 	const domain$1 = config$3.domains?.[0];
-	if (domain$1 !== void 0) return getZoneFromRoute(domain$1);
+	if (domain$1 !== void 0) return getZoneFromRoute(typeof domain$1 === "string" ? domain$1 : domain$1.hostname);
 	const fetchTrigger = config$3.triggers?.find((trigger) => trigger.type === "fetch");
 	if (fetchTrigger?.type !== "fetch") return;
 	return getZoneFromRoute(fetchTrigger.zone?.includes(".") ? {
@@ -90342,7 +90322,8 @@ const devPlugin = createPlugin("dev", (ctx) => {
 					dockerPath,
 					containerOptions,
 					settings: ctx.resolvedPluginConfig.settings,
-					logger: viteDevServer.config.logger
+					logger: viteDevServer.config.logger,
+					cliDisplayName: ctx.resolvedPluginConfig.cliDisplayName
 				});
 				containerCleanup.track(dockerPath, containerOptions.map(({ image_tag }) => image_tag));
 				viteDevServer.config.logger.info(import_picocolors$2.default.dim(import_picocolors$2.default.yellow("\n⚡️ Containers successfully built. To rebuild your containers during development, restart the Vite dev server (r + enter).")));
@@ -90488,7 +90469,8 @@ const previewPlugin = createPlugin("preview", (ctx) => {
 				dockerPath: getDockerPath(),
 				containerOptions,
 				settings: ctx.resolvedPluginConfig.settings,
-				logger: vitePreviewServer.config.logger
+				logger: vitePreviewServer.config.logger,
+				cliDisplayName: ctx.resolvedPluginConfig.cliDisplayName
 			});
 		}
 		if (vitePreviewServer.httpServer) vitePreviewServer.httpServer.on("listening", () => {

package/dist/{package-DXI-SUrO.mjs → package-ZJ4jOE44.mjs}

@@ -1,7 +1,7 @@
 //#region package.json
 var package_default = {
 	name: "@cloudflare/vite-plugin",
-	version: "2.0.0-beta.v.0",
+	version: "2.0.0-beta.v.2",
 	description: "Cloudflare plugin for Vite",
 	keywords: [
 		"cloudflare",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/vite-plugin",
-  "version": "2.0.0-beta.v.0",
+  "version": "2.0.0-beta.v.2",
   "description": "Cloudflare plugin for Vite",
   "keywords": [
     "cloudflare",
@@ -42,14 +42,14 @@
   "dependencies": {
     "unenv": "2.0.0-rc.24",
     "ws": "8.21.0",
-    "@cloudflare/build-output-utils": "0.9.2",
-    "@cloudflare/config": "0.26.0",
-    "@cloudflare/runtime-types": "0.1.11",
-    "@cloudflare/unenv-preset": "2.16.2",
-    "miniflare": "5.20261012.0-beta"
+    "@cloudflare/build-output-utils": "0.9.3",
+    "@cloudflare/runtime-types": "0.1.13",
+    "@cloudflare/config": "0.27.0",
+    "miniflare": "5.20261019.0-beta",
+    "@cloudflare/unenv-preset": "2.16.2"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^5.20261006.1",
+    "@cloudflare/workers-types": "^5.20261019.1",
     "@remix-run/node-fetch-server": "^0.8.0",
     "@types/node": "22.15.17",
     "@types/semver": "^7.5.1",
@@ -71,9 +71,9 @@
     "vite-legacy": "npm:vite@7.1.12",
     "vitest": "4.1.0",
     "@cloudflare/cli-shared-helpers": "0.2.6",
-    "@cloudflare/containers-shared": "0.22.0",
+    "@cloudflare/containers-shared": "0.23.0",
     "@cloudflare/mock-npm-registry": "0.0.0",
-    "@cloudflare/remote-bindings": "0.0.48",
+    "@cloudflare/remote-bindings": "0.0.50",
     "@cloudflare/workers-auth": "0.14.0",
     "@cloudflare/workers-shared": "0.20.1",
     "@cloudflare/workers-tsconfig": "0.0.0",