wrangler 4.136.0 → 4.136.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.136.0",
+  "version": "4.136.1",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "assembly",
@@ -73,7 +73,7 @@
     "unenv": "2.0.0-rc.24",
     "workerd": "1.20260921.1",
     "@cloudflare/kv-asset-handler": "0.5.0",
-    "@cloudflare/unenv-preset": "2.16.1",
+    "@cloudflare/unenv-preset": "2.16.2",
     "miniflare": "5.20260921.0-alpha"
   },
   "devDependencies": {
@@ -164,18 +164,18 @@
     "@cloudflare/autoconfig": "0.6.0",
     "@cloudflare/build-output-utils": "0.7.0",
     "@cloudflare/cli-shared-helpers": "0.1.35",
+    "@cloudflare/config": "0.16.0",
     "@cloudflare/containers-shared": "0.18.0",
     "@cloudflare/deploy-helpers": "0.14.0",
     "@cloudflare/pages-functions": "0.1.0",
-    "@cloudflare/pages-shared": "^0.13.186",
-    "@cloudflare/config": "0.16.0",
     "@cloudflare/remote-bindings": "0.0.29",
+    "@cloudflare/pages-shared": "^0.13.186",
     "@cloudflare/runtime-types": "0.0.31",
     "@cloudflare/shared-ast-primitives": "1.1.0",
     "@cloudflare/workers-auth": "0.7.4",
     "@cloudflare/workers-shared": "0.19.9",
-    "@cloudflare/workers-tsconfig": "0.0.0",
     "@cloudflare/workers-utils": "0.41.0",
+    "@cloudflare/workers-tsconfig": "0.0.0",
     "@cloudflare/workflows-shared": "0.14.0"
   },
   "peerDependencies": {

package/wrangler-dist/cli.js

@@ -62207,6 +62207,7 @@ var init_esm2 = __esm({
 // ../deploy-helpers/src/shared/context.ts
 function initDeployHelpersContext(ctx) {
   logger = ctx.logger;
+  createCloudflareClient = ctx.createCloudflareClient;
   fetchResult = ctx.fetchResult;
   fetchListResult = ctx.fetchListResult;
   fetchPagedListResult = ctx.fetchPagedListResult;
@@ -62215,7 +62216,7 @@ function initDeployHelpersContext(ctx) {
   prompt = ctx.prompt;
   select = ctx.select;
 }
-var logger, fetchResult, fetchListResult, fetchPagedListResult, confirm, prompt, select;
+var logger, createCloudflareClient, fetchResult, fetchListResult, fetchPagedListResult, confirm, prompt, select;
 var init_context = __esm({
   "../deploy-helpers/src/shared/context.ts"() {
     init_import_meta_url();
@@ -62228,7 +62229,7 @@ var name, version2;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version2 = "4.136.0";
+    version2 = "4.136.1";
   }
 });
 
@@ -134947,7 +134948,7 @@ async function logResponse(response) {
   logger2.debugWithSanitization("RESPONSE:", jsonText);
   logger2.debug("-- END CF API RESPONSE");
 }
-function createCloudflareClient(complianceConfig) {
+function createCloudflareClient2(complianceConfig) {
   return new cloudflare_default({
     fetch: /* @__PURE__ */ __name(async (url4, init4) => {
       const request4 = new import_undici4.Request(url4, { ...init4, duplex: "half" });
@@ -135122,7 +135123,7 @@ var init_internal = __esm({
     init_user3();
     __name(logRequest, "logRequest");
     __name(logResponse, "logResponse");
-    __name(createCloudflareClient, "createCloudflareClient");
+    __name(createCloudflareClient2, "createCloudflareClient");
     __name(performApiFetch, "performApiFetch");
     __name(fetchInternal, "fetchInternal");
     __name(cloneHeaders2, "cloneHeaders");
@@ -135269,6 +135270,7 @@ var init_cfetch2 = __esm({
 function initApiDeployHelpersContext() {
   initDeployHelpersContext({
     logger: logger2,
+    createCloudflareClient: createCloudflareClient2,
     fetchResult: fetchResult2,
     fetchListResult: fetchListResult2,
     fetchPagedListResult: fetchPagedListResult2,
@@ -135283,6 +135285,7 @@ var init_deploy_helpers_context = __esm({
     init_import_meta_url();
     init_context();
     init_cfetch2();
+    init_internal();
     init_dialogs();
     init_logger2();
     __name(initApiDeployHelpersContext, "initApiDeployHelpersContext");
@@ -155050,6 +155053,17 @@ function toValidSubdomain(input) {
   return subdomain || "my-worker";
 }
 async function getWorkersDevSubdomain(complianceConfig, accountId, options = {}) {
+  const result = await getWorkersDevSubdomainInternal(
+    complianceConfig,
+    accountId,
+    options
+  );
+  if ("unauthorizedError" in result) {
+    throw result.unauthorizedError;
+  }
+  return result.subdomain;
+}
+async function getWorkersDevSubdomainInternal(complianceConfig, accountId, options) {
   const {
     abortSignal,
     autoRegisterSubdomain,
@@ -155064,40 +155078,67 @@ async function getWorkersDevSubdomain(complianceConfig, accountId, options = {})
       void 0,
       abortSignal
     );
-    return `${subdomain}${getComplianceRegionSubdomain(complianceConfig)}.workers.dev`;
+    return {
+      subdomain: `${subdomain}${getComplianceRegionSubdomain(complianceConfig)}.workers.dev`
+    };
   } catch (e11) {
+    if (e11 instanceof APIError && e11.code === 1e4) {
+      return { unauthorizedError: e11 };
+    }
     const error53 = e11;
     if (typeof error53 !== "object" || !error53 || error53.code !== 10007) {
       throw e11;
     }
-    logger.warn(getRegistrationWarning(registrationContext));
-    if (autoRegisterSubdomain) {
-      return await registerSubdomain(
+  }
+  logger.warn(getRegistrationWarning(registrationContext));
+  if (autoRegisterSubdomain) {
+    return {
+      subdomain: await registerSubdomain(
         complianceConfig,
         accountId,
         configPath,
         registrationContext,
         autoRegisterSubdomain
-      );
-    }
-    const wantsToRegister = await confirm(
-      "Would you like to register a workers.dev subdomain now?",
-      { fallbackValue: false }
+      )
+    };
+  }
+  const wantsToRegister = await confirm(
+    "Would you like to register a workers.dev subdomain now?",
+    { fallbackValue: false }
+  );
+  if (!wantsToRegister) {
+    throw getRegistrationDeclinedError(
+      registrationContext,
+      accountId,
+      configPath
     );
-    if (!wantsToRegister) {
-      throw getRegistrationDeclinedError(
-        registrationContext,
-        accountId,
-        configPath
-      );
-    }
-    return await registerSubdomain(
+  }
+  return {
+    subdomain: await registerSubdomain(
       complianceConfig,
       accountId,
       configPath,
       registrationContext
-    );
-  }
+    )
+  };
+}
+async function getWorkersDevSubdomainIfAccessible(complianceConfig, accountId, options = {}) {
+  const result = await getWorkersDevSubdomainInternal(
+    complianceConfig,
+    accountId,
+    options
+  );
+  return "unauthorizedError" in result ? void 0 : result.subdomain;
+}
+async function getWorkerSubdomain(complianceConfig, accountId, workerName) {
+  const worker = await createCloudflareClient(
+    complianceConfig
+  ).workers.beta.workers.get(workerName, { account_id: accountId });
+  return {
+    ...worker.subdomain,
+    enabled: worker.subdomain.enabled ?? false,
+    previews_enabled: worker.subdomain.previews_enabled ?? false
+  };
 }
 function getRegistrationWarning(registrationContext) {
   switch (registrationContext) {
@@ -155250,6 +155291,9 @@ var init_subdomain2 = __esm({
     init_context();
     __name(toValidSubdomain, "toValidSubdomain");
     __name(getWorkersDevSubdomain, "getWorkersDevSubdomain");
+    __name(getWorkersDevSubdomainInternal, "getWorkersDevSubdomainInternal");
+    __name(getWorkersDevSubdomainIfAccessible, "getWorkersDevSubdomainIfAccessible");
+    __name(getWorkerSubdomain, "getWorkerSubdomain");
     __name(getRegistrationWarning, "getRegistrationWarning");
     __name(getRegistrationDeclinedError, "getRegistrationDeclinedError");
     __name(registerSubdomain, "registerSubdomain");
@@ -155701,8 +155745,7 @@ function getSubdomainValuesAPIMock(config_workers_dev, config_preview_urls, rout
     preview_urls
   };
 }
-async function validateSubdomainMixedState(props, accountId, scriptName, before, after, firstDeploy) {
-  const { config: config2 } = props;
+async function validateSubdomainMixedState(scriptName, before, after, previewURLSuffix, firstDeploy) {
   const changed = after.workers_dev !== before.workers_dev || after.preview_urls !== before.preview_urls;
   if (!changed) {
     return after;
@@ -155719,10 +155762,7 @@ async function validateSubdomainMixedState(props, accountId, scriptName, before,
   if (after.workers_dev === after.preview_urls) {
     return after;
   }
-  const userSubdomain = await getWorkersDevSubdomain(config2, accountId, {
-    configPath: config2.configPath
-  });
-  const previewUrl = `https://<VERSION_PREFIX>-${scriptName}.${userSubdomain}`;
+  const previewUrl = previewURLSuffix ? `https://<VERSION_PREFIX>${previewURLSuffix}` : `https://<VERSION_PREFIX>-${scriptName}.<YOUR_SUBDOMAIN>.workers.dev`;
   if (!after.workers_dev && after.preview_urls) {
     logger.warn(
       [
@@ -155750,14 +155790,17 @@ async function validateSubdomainMixedState(props, accountId, scriptName, before,
 async function subdomainDeploy(props, accountId, scriptName, workerUrl, routes, deployments, firstDeploy) {
   const { config: config2 } = props;
   const { workers_dev: wantWorkersDev, preview_urls: wantPreviews } = getSubdomainValues(config2.workers_dev, config2.preview_urls, routes);
+  const before = await getWorkerSubdomain(config2, accountId, scriptName);
   if (wantWorkersDev) {
-    const userSubdomain = await getWorkersDevSubdomain(config2, accountId, {
+    const workersDevHostname = before.url ? new URL(before.url).hostname : `${scriptName}.${await getWorkersDevSubdomain(config2, accountId, {
       configPath: config2.configPath
-    });
-    const workersDevURL = `${scriptName}.${userSubdomain}`;
-    deployments.push(Promise.resolve({ targets: [workersDevURL] }));
+    })}`;
+    deployments.push(
+      Promise.resolve({
+        targets: [workersDevHostname]
+      })
+    );
   }
-  const before = await fetchResult(config2, `${workerUrl}/subdomain`);
   const after = await retryOnAPIFailure(
     async () => fetchResult(config2, `${workerUrl}/subdomain`, {
       method: "POST",
@@ -155803,11 +155846,10 @@ async function subdomainDeploy(props, accountId, scriptName, workerUrl, routes,
     );
   }
   await validateSubdomainMixedState(
-    props,
-    accountId,
     scriptName,
     { workers_dev: before.enabled, preview_urls: before.previews_enabled },
     { workers_dev: after.enabled, preview_urls: after.previews_enabled },
+    before.preview_url_suffix,
     firstDeploy
   );
   return {
@@ -170640,7 +170682,7 @@ Edits that have been made via the script API will be overridden by your local co
   );
   const wantsWorkersDev = props.command === "deploy" && props.dispatchNamespace === void 0 && getSubdomainValues(config2.workers_dev, config2.preview_urls, props.routes).workers_dev;
   if (!workerExists && wantsWorkersDev) {
-    await getWorkersDevSubdomain(config2, accountId, {
+    await getWorkersDevSubdomainIfAccessible(config2, accountId, {
       autoRegisterSubdomain: props.autoRegisterWorkersDevSubdomain,
       configPath: config2.configPath
     });
@@ -171580,16 +171622,17 @@ async function uploadWorkerVersion(props, config2, buildResult, callbacks) {
   let versionPreviewUrl = void 0;
   let versionPreviewAliasUrl = void 0;
   if (versionId && hasPreview) {
-    const { previews_enabled: previews_available_on_subdomain } = await fetchResult(config2, `${workerUrl}/subdomain`);
-    if (previews_available_on_subdomain) {
-      const userSubdomain = await getWorkersDevSubdomain(config2, accountId, {
-        configPath: config2.configPath
-      });
+    const workerSubdomain = await getWorkerSubdomain(
+      config2,
+      accountId,
+      workerName
+    );
+    if (workerSubdomain.previews_enabled && workerSubdomain.preview_url_suffix) {
       const shortVersion = versionId.slice(0, 8);
-      versionPreviewUrl = `https://${shortVersion}-${workerName}.${userSubdomain}`;
+      versionPreviewUrl = `https://${shortVersion}${workerSubdomain.preview_url_suffix}`;
       logger.log(`Version Preview URL: ${versionPreviewUrl}`);
       if (props.previewAlias) {
-        versionPreviewAliasUrl = `https://${props.previewAlias}-${workerName}.${userSubdomain}`;
+        versionPreviewAliasUrl = `https://${props.previewAlias}${workerSubdomain.preview_url_suffix}`;
         logger.log(`Version Preview Alias URL: ${versionPreviewAliasUrl}`);
       }
     }
@@ -225395,6 +225438,7 @@ function createHandler2(def, argv) {
         try {
           initDeployHelpersContext({
             logger: logger2,
+            createCloudflareClient: createCloudflareClient2,
             fetchResult: fetchResult2,
             fetchListResult: fetchListResult2,
             fetchPagedListResult: fetchPagedListResult2,
@@ -225404,7 +225448,7 @@ function createHandler2(def, argv) {
             select: select2
           });
           const result = await def.handler(args, {
-            sdk: createCloudflareClient(config2),
+            sdk: createCloudflareClient2(config2),
             config: config2,
             errors: { UserError, FatalError },
             logger: logger2,
@@ -295412,6 +295456,7 @@ async function runPagesToWorkersDeploy(delegation) {
     await run(experimentalFlags, async () => {
       initDeployHelpersContext({
         logger: logger2,
+        createCloudflareClient: createCloudflareClient2,
         fetchResult: fetchResult2,
         fetchListResult: fetchListResult2,
         fetchPagedListResult: fetchPagedListResult2,
@@ -295445,6 +295490,7 @@ var init_run_workers_deploy = __esm({
     init_import_meta_url();
     init_context();
     init_cfetch2();
+    init_internal();
     init_config6();
     init_deploy3();
     init_dialogs();
@@ -337128,17 +337174,20 @@ async function ensurePreviewsConfig(accountId, args, config2) {
       ...selectedConversion.blockingDeploymentMessages
     ])
   ];
-  if (!hasPreviewBase && containsGeneratedPlaceholder(proposedConfig)) {
-    conversionMessages.push(
-      "Replace each <REPLACE_ME> placeholder with a Preview-safe value. Do not use production resources unless you intend for this Preview to access them."
-    );
-  }
   const hasEmptyProposedConfig = Object.keys(proposedConfig).length === 0;
   const hasBlockingDeploymentMessages = selectedConversion.blockingDeploymentMessages.length > 0;
   const missingPreviewsConfigParagraphs = [
     hasEmptyProposedConfig && conversionMessages.length === 0 ? "Your Wrangler configuration is missing a `previews` block to run this command. Add the following to your configuration file:" : hasEmptyProposedConfig || hasBlockingDeploymentMessages ? "Your Wrangler configuration needs a `previews` block to run this command. Add the following to your configuration file:" : "Your Wrangler configuration is missing a `previews` block. Add the following to your configuration file:",
     formattedProposedConfig
   ];
+  if (!hasPreviewBase && containsGeneratedPlaceholder(proposedConfig)) {
+    const replacementMessage = "Replace each <REPLACE_ME> placeholder with a Preview-safe value. Do not use production resources unless you intend for this Preview to access them.";
+    missingPreviewsConfigParagraphs.push(`
+${replacementMessage}`);
+    if (args.json) {
+      conversionMessages.push(replacementMessage);
+    }
+  }
   if (hasEmptyProposedConfig && conversionMessages.length === 0) {
     missingPreviewsConfigParagraphs.push(
       "To create or update a Preview with `npx wrangler preview`, your Wrangler configuration must include a `previews` block. The block can be empty. Assets, compatibility settings, migrations, and placement stay at the top level and do not need to be added to `previews`.\nLearn more: https://developers.cloudflare.com/workers/previews/configuration/#wrangler-configuration-file"
@@ -358695,6 +358744,7 @@ var init_DevEnv = __esm({
     init_context();
     init_src();
     init_cfetch2();
+    init_internal();
     init_build_failures();
     init_dialogs();
     init_logger2();
@@ -358714,6 +358764,7 @@ var init_DevEnv = __esm({
       async startWorker(options) {
         initDeployHelpersContext({
           logger: logger2,
+          createCloudflareClient: createCloudflareClient2,
           fetchResult: fetchResult2,
           fetchListResult: fetchListResult2,
           fetchPagedListResult: fetchPagedListResult2,