wrangler 4.155.0 → 4.156.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.155.0",
+  "version": "4.156.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "assembly",
@@ -73,8 +73,8 @@
     "unenv": "2.0.0-rc.24",
     "workerd": "1.20261023.1",
     "@cloudflare/kv-asset-handler": "0.5.0",
-    "@cloudflare/unenv-preset": "2.16.2",
-    "miniflare": "5.20261023.2-beta"
+    "miniflare": "5.20261023.3-beta",
+    "@cloudflare/unenv-preset": "2.16.2"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
@@ -164,22 +164,22 @@
     "yaml": "^2.8.1",
     "yargs": "^17.7.2",
     "zod": "4.6.6",
+    "@cloudflare/autoconfig": "0.8.3",
     "@cloudflare/build-output-utils": "0.9.6",
-    "@cloudflare/autoconfig": "0.8.2",
+    "@cloudflare/cli-shared-helpers": "0.3.0",
     "@cloudflare/config": "0.29.0",
-    "@cloudflare/cli-shared-helpers": "0.2.10",
-    "@cloudflare/containers-shared": "0.23.4",
-    "@cloudflare/deploy-helpers": "0.24.2",
+    "@cloudflare/containers-shared": "0.23.5",
+    "@cloudflare/deploy-helpers": "0.24.3",
     "@cloudflare/pages-functions": "0.1.2",
-    "@cloudflare/pages-shared": "^0.13.204",
-    "@cloudflare/remote-bindings": "0.0.55",
-    "@cloudflare/runtime-types": "0.1.18",
+    "@cloudflare/pages-shared": "^0.13.205",
+    "@cloudflare/remote-bindings": "0.0.56",
+    "@cloudflare/runtime-types": "0.1.19",
     "@cloudflare/shared-ast-primitives": "1.1.0",
-    "@cloudflare/workers-auth": "0.15.2",
+    "@cloudflare/workers-auth": "0.15.3",
     "@cloudflare/workers-shared": "0.20.2",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/workers-utils": "0.50.0",
-    "@cloudflare/workflows-shared": "0.15.3"
+    "@cloudflare/workers-utils": "0.50.1",
+    "@cloudflare/workflows-shared": "0.15.3",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^5.20261023.1"

package/wrangler-dist/cli.js

@@ -438,7 +438,7 @@ function validateDurableObjectContainerApplications(config2, containers = getDur
         { telemetryMessage: "no DO defined that matches container class_name" }
       );
     }
-    if (maybeBoundDO?.script_name !== void 0) {
+    if (maybeBoundDO?.script_name !== void 0 && maybeBoundDO.script_name !== config2.name) {
       throw new UserError(
         `The container ${container.name} is referencing the durable object ${container.class_name}, which appears to be defined on the ${maybeBoundDO.script_name} Worker instead (via the 'script_name' field). You cannot configure a container on a Durable Object that is defined in another Worker.`,
         {
@@ -68193,7 +68193,7 @@ var name, version2;
 var init_package = __esm({
   "package.json"() {
     name = "wrangler";
-    version2 = "4.155.0";
+    version2 = "4.156.0";
   }
 });
 
@@ -140693,6 +140693,19 @@ async function fetchGraphqlResult(complianceConfig, init4 = {}, abortSignal) {
     throw new Error("A request to the Cloudflare API (/graphql) failed.");
   }
 }
+async function fetchGraphqlResultOrThrow(complianceConfig, init4 = {}) {
+  const { response, status: status2, retryAfterMs } = await fetchInternal(
+    complianceConfig,
+    "/graphql",
+    { ...init4, method: "POST" }
+  );
+  const errors = response.errors ?? [];
+  if (status2 >= 400 || errors.length > 0) {
+    const apiMessage = errors.flatMap((error64) => error64.message ?? []).join("; ") || `HTTP ${status2} with no error message`;
+    throw new GraphQLAnalyticsError(status2, apiMessage, retryAfterMs);
+  }
+  return response;
+}
 async function fetchListResult2(complianceConfig, resource, init4 = {}, queryParams) {
   const credentials = await resolveCredentials(complianceConfig);
   return fetchListResultBase(
@@ -140773,6 +140786,7 @@ async function fetchCursorPage(complianceConfig, resource, init4 = {}, queryPara
   }
   return results;
 }
+var GraphQLAnalyticsError;
 var init_cfetch2 = __esm({
   "src/cfetch/index.ts"() {
     init_import_meta_url();
@@ -140783,6 +140797,25 @@ var init_cfetch2 = __esm({
     init_internal();
     __name(fetchResult2, "fetchResult");
     __name(fetchGraphqlResult, "fetchGraphqlResult");
+    GraphQLAnalyticsError = class extends APIError {
+      static {
+        __name(this, "GraphQLAnalyticsError");
+      }
+      reason;
+      apiMessage;
+      constructor(status2, apiMessage, retryAfterMs) {
+        const reason = status2 === 429 || /rate limiter budget depleted/i.test(apiMessage) ? "rate-limited" : status2 === 401 || status2 === 403 ? "unauthorized" : "other";
+        super({
+          text: `The GraphQL Analytics API returned an error: ${apiMessage}`,
+          status: status2,
+          retryAfterMs,
+          telemetryMessage: `cfetch graphql ${reason}`
+        });
+        this.reason = reason;
+        this.apiMessage = apiMessage;
+      }
+    };
+    __name(fetchGraphqlResultOrThrow, "fetchGraphqlResultOrThrow");
     __name(fetchListResult2, "fetchListResult");
     __name(fetchPagedListResult2, "fetchPagedListResult");
     __name(fetchCursorPage, "fetchCursorPage");
@@ -170866,7 +170899,7 @@ async function prepareDurableObjectContainerApplications(config2, durableObjectC
   versionsUploadCommand: versionsUploadCommand2
 }) {
   validateDurableObjectContainerApplications(
-    config2,
+    { ...config2, name: scriptName },
     durableObjectContainerConfig,
     configFileName(config2.configPath, config2.userConfigPath)
   );
@@ -186922,7 +186955,7 @@ var init_dist14 = __esm({
     init_wrapper();
     init_create_worker_upload_form();
     import_undici14 = __toESM(require_undici(), 1);
-    version3 = "0.0.55";
+    version3 = "0.0.56";
     NoDefaultValueProvided2 = class extends UserError {
       static {
         __name(this, "NoDefaultValueProvided");
@@ -205363,7 +205396,7 @@ var init_config7 = __esm({
         const maybeBoundDO = config2.durable_objects.bindings.find(
           (durableObject) => durableObject.class_name === className
         );
-        if (maybeBoundDO && maybeBoundDO.script_name !== void 0) {
+        if (maybeBoundDO?.script_name !== void 0 && maybeBoundDO.script_name !== config2.name) {
           throw new UserError(
             `The container ${container.name} is referencing the durable object ${className}, which appears to be defined on the ${maybeBoundDO.script_name} Worker instead (via the 'script_name' field). You cannot configure a container on a Durable Object that is defined in another Worker.`,
             {
@@ -221527,7 +221560,7 @@ async function mergeDeployConfigArgs(args, config2) {
   }));
   const routes = args.routes ? applyZoneArgsToRoutes(args.routes, args) : config2.routes ?? (config2.route ? [config2.route] : []);
   const normalizedContainerConfig = await getNormalizedContainerOptions(
-    config2,
+    { ...config2, name: shared.name },
     {
       containersRollout: args.containersRollout,
       dryRun: shared.dryRun
@@ -239919,11 +239952,45 @@ function getDurationDates(durationString) {
   }
   return [startDate.toISOString(), endDate.toISOString()];
 }
+function toD1InsightsUserError(error64, accountId) {
+  switch (error64.reason) {
+    case "rate-limited":
+      return new UserError(
+        esm_default`
+					Could not get D1 insights: the GraphQL Analytics API rate limited the request (${error64.apiMessage}).
+
+					${error64.retryAfterMs === void 0 ? "The rate limit resets within 5 minutes: wait" : `Wait ${Math.ceil(error64.retryAfterMs / 1e3)} seconds`} before running \`wrangler d1 insights\` again. To use less of the rate limit budget, pass a database name, a shorter --time-period, or a smaller --limit.
+					See https://developers.cloudflare.com/analytics/graphql-api/limits/
+				`,
+        { telemetryMessage: "d1 insights graphql rate limited", cause: error64 }
+      );
+    case "unauthorized":
+      return new UserError(
+        esm_default`
+					Could not get D1 insights: not allowed to read analytics for account ${accountId} (${error64.apiMessage}).
+
+					\`wrangler d1 insights\` needs the "Account Analytics: Read" permission on this account. If you use CLOUDFLARE_API_TOKEN, add that permission to the token at https://dash.cloudflare.com/profile/api-tokens. Otherwise run \`wrangler login\` again, and check that CLOUDFLARE_ACCOUNT_ID or \`account_id\` points at an account you are a member of.
+				`,
+        { telemetryMessage: "d1 insights graphql unauthorized", cause: error64 }
+      );
+    case "other":
+      return new UserError(
+        esm_default`
+					Could not get D1 insights: the GraphQL Analytics API returned an error (${error64.apiMessage}).
+
+					Check the --time-period, --limit and sort options, then run \`wrangler d1 insights\` again.
+					See https://developers.cloudflare.com/analytics/graphql-api/errors/
+				`,
+        { telemetryMessage: "d1 insights graphql error", cause: error64 }
+      );
+  }
+}
 var cliOptionToGraphQLOption, d1InsightsCommand;
 var init_insights3 = __esm({
   "src/d1/insights.ts"() {
     init_import_meta_url();
     init_src();
+    init_esm();
     init_cfetch2();
     init_create_command();
     init_logger2();
@@ -239936,9 +240003,10 @@ var init_insights3 = __esm({
       count: "count"
     };
     __name(getDurationDates, "getDurationDates");
+    __name(toD1InsightsUserError, "toD1InsightsUserError");
     d1InsightsCommand = createCommand({
       metadata: {
-        description: "Get information about the queries run on a D1 database",
+        description: "Get information about the queries run on a D1 database, or on all D1 databases in the account",
         epilogue: "This command acts on remote D1 Databases.",
         status: "experimental",
         owner: "Product: D1"
@@ -239950,8 +240018,7 @@ var init_insights3 = __esm({
       args: {
         name: {
           type: "string",
-          demandOption: true,
-          description: "The name of the DB"
+          description: "The name or binding of the DB. Omit to get insights for every D1 database in the account"
         },
         "time-period": {
           type: "string",
@@ -239997,12 +240064,12 @@ var init_insights3 = __esm({
       positionalArgs: ["name"],
       async handler({ name: name2, json: json2, limit: limit2, timePeriod, sortType, sortBy, sortDirection }, { config: config2 }) {
         const accountId = await requireAuth(config2);
-        const db = await getDatabaseByNameOrBinding(config2, accountId, name2);
+        const db = name2 === void 0 ? void 0 : await getDatabaseByNameOrBinding(config2, accountId, name2);
         const output2 = [];
         const [startDate, endDate] = getDurationDates(timePeriod);
         const parsedSortBy = cliOptionToGraphQLOption[sortBy];
         const orderByClause = parsedSortBy === "count" ? `${parsedSortBy}_${sortDirection}` : `${sortType}_${parsedSortBy}_${sortDirection}`;
-        const graphqlQueriesResult = await fetchGraphqlResult(config2, {
+        const graphqlQueriesResult = await fetchGraphqlResultOrThrow(config2, {
           method: "POST",
           body: JSON.stringify({
             query: `query getD1QueriesOverviewQuery($accountTag: string, $filter: ZoneWorkersRequestsFilter_InputObject) {
@@ -240024,6 +240091,7 @@ var init_insights3 = __esm({
 											count
 											dimensions {
 													query
+													databaseId
 											}
 										}
 									}
@@ -240037,7 +240105,7 @@ var init_insights3 = __esm({
                   {
                     datetimeHour_geq: startDate,
                     datetimeHour_leq: endDate,
-                    databaseId: db.uuid
+                    ...db ? { databaseId: db.uuid } : {}
                   }
                 ]
               }
@@ -240046,6 +240114,11 @@ var init_insights3 = __esm({
           headers: {
             "Content-Type": "application/json"
           }
+        }).catch((err) => {
+          if (err instanceof GraphQLAnalyticsError) {
+            throw toD1InsightsUserError(err, accountId);
+          }
+          throw err;
         });
         graphqlQueriesResult?.data?.viewer?.accounts[0]?.d1QueriesAdaptiveGroups?.forEach(
           (row) => {
@@ -240061,7 +240134,8 @@ var init_insights3 = __esm({
               avgDurationMs: row?.avg?.queryDurationMs ?? 0,
               totalDurationMs: row?.sum?.queryDurationMs ?? 0,
               numberOfTimesRun: row?.count ?? 0,
-              queryEfficiency: row?.avg?.rowsReturned && row?.avg?.rowsRead ? row?.avg?.rowsReturned / row?.avg?.rowsRead : 0
+              queryEfficiency: row?.avg?.rowsReturned && row?.avg?.rowsRead ? row?.avg?.rowsReturned / row?.avg?.rowsRead : 0,
+              ...db ? {} : { databaseId: row.dimensions.databaseId ?? null }
             });
           }
         );
@@ -296192,6 +296266,19 @@ async function getDetailsForAutoConfig({
       configured
     });
   }
+  if (framework.id === staticFramework.id && (context2.isNonInteractiveOrCI?.() ?? false) && path29.resolve(projectPath, outputDir) === path29.resolve(projectPath) && (await getPathStats(path29.join(projectPath, "functions")))?.isDirectory()) {
+    const configFile = target === "cf" ? `a \`${CLOUDFLARE_CONFIG_FILE}\` file` : "a Wrangler configuration file";
+    throw new AutoConfigDetectionError(
+      `This project has a \`functions\` directory and static files in its root, which looks like a Cloudflare Pages project using Pages Functions. Automatic configuration cannot migrate Pages Functions to Workers yet, and deploying the project root as static assets would leave the Functions undeployed.
+If \`functions\` contains Pages Functions, move the static files into a subdirectory (for example \`public/\`) and deploy with \`wrangler pages deploy public --project-name <name>\`, or migrate the Functions to a Worker: https://developers.cloudflare.com/workers/static-assets/migration-guides/migrate-from-pages/
+If \`functions\` is not Pages Functions, move the static files into a subdirectory or add ${configFile} for the Worker.`,
+      {
+        telemetryMessage: "autoconfig details pages functions with root assets",
+        frameworkId: framework.id,
+        configured
+      }
+    );
+  }
   return {
     ...baseDetails,
     outputDir,
@@ -296321,7 +296408,7 @@ var init_details2 = __esm({
     __name(confirmAutoConfigDetails, "confirmAutoConfigDetails");
   }
 });
-function maybeAppendWranglerToGitIgnoreLikeFile(filePath) {
+function maybeAppendWranglerToGitIgnoreLikeFile(filePath, { additionalEntries = [], requireEnvWildcard = false } = {}) {
   const filePreExisted = fs14.existsSync(filePath);
   if (!filePreExisted) fs14.writeFileSync(filePath, "");
   const existingGitIgnoreContent = readFileSync(filePath);
@@ -296330,8 +296417,10 @@ function maybeAppendWranglerToGitIgnoreLikeFile(filePath) {
   if (!hasDotWrangler) wranglerGitIgnoreFilesToAdd.push(".wrangler");
   if (!existingGitIgnoreContent.match(/^\/?\.dev\.vars\*(\s|$)/m)) wranglerGitIgnoreFilesToAdd.push(".dev.vars*");
   if (!existingGitIgnoreContent.match(/^!\/?\.dev\.vars\.example(\s|$)/m)) wranglerGitIgnoreFilesToAdd.push("!.dev.vars.example");
-  if (!existingGitIgnoreContent.match(/^\/?\.env\*?(\..*?)?(\s|$)/m)) wranglerGitIgnoreFilesToAdd.push(".env*");
+  if (!existingGitIgnoreContent.match(requireEnvWildcard ? /^\.env\*(\s|$)/m : /^\/?\.env\*?(\..*?)?(\s|$)/m)) wranglerGitIgnoreFilesToAdd.push(".env*");
   if (!existingGitIgnoreContent.match(/^!\/?\.env\.example(\s|$)/m)) wranglerGitIgnoreFilesToAdd.push("!.env.example");
+  const existingLines = new Set(existingGitIgnoreContent.split(/\r?\n/).map((line) => line.trim()));
+  for (const entry of additionalEntries) if (!existingLines.has(entry) && !wranglerGitIgnoreFilesToAdd.includes(entry)) wranglerGitIgnoreFilesToAdd.push(entry);
   if (wranglerGitIgnoreFilesToAdd.length === 0) return;
   const s8 = spinner();
   s8.start(`Adding Wrangler files to the ${path29.basename(filePath)} file`);
@@ -296358,12 +296447,22 @@ function directoryExists(path$1) {
     throw new Error(error64);
   }
 }
+var PROJECT_ROOT_ASSETS_IGNORE_ENTRIES;
 var init_gitignore = __esm({
   "../cli/dist/gitignore.mjs"() {
     init_import_meta_url();
     init_colors();
     init_interactive();
     init_src();
+    PROJECT_ROOT_ASSETS_IGNORE_ENTRIES = [
+      "/_worker.js",
+      "/_routes.json",
+      "/functions",
+      "node_modules",
+      ".git",
+      ".DS_Store",
+      ".npmrc"
+    ];
     __name(maybeAppendWranglerToGitIgnoreLikeFile, "maybeAppendWranglerToGitIgnoreLikeFile");
     __name(maybeAppendWranglerToGitIgnore, "maybeAppendWranglerToGitIgnore");
     __name(directoryExists, "directoryExists");
@@ -296641,10 +296740,23 @@ ${JSON.stringify(autoConfigDetails, null, 2)}...`
     }
   }
   maybeAppendWranglerToGitIgnore(autoConfigDetails.projectPath);
-  if (autoConfigDetails.outputDir === autoConfigDetails.projectPath) {
+  const assetsDirectory = configurationResults.buildConfig?.assetsDirectory;
+  if (assetsDirectory !== void 0 && path29.resolve(autoConfigDetails.projectPath, assetsDirectory) === path29.resolve(autoConfigDetails.projectPath)) {
     maybeAppendWranglerToGitIgnoreLikeFile(
-      `${autoConfigDetails.projectPath}/.assetsignore`
+      `${autoConfigDetails.projectPath}/.assetsignore`,
+      {
+        additionalEntries: PROJECT_ROOT_ASSETS_IGNORE_ENTRIES,
+        requireEnvWildcard: true
+      }
+    );
+    const pagesServerCode = workerConfig?.entrypoint ? [] : ["functions", "_worker.js"].filter(
+      (name2) => fs14.existsSync(path29.resolve(autoConfigDetails.projectPath, name2))
     );
+    if (pagesServerCode.length > 0) {
+      context2.logger.warn(
+        `${pagesServerCode.map((name2) => `\`${name2}\``).join(" and ")} in the project root will not be deployed: the project is configured as static assets, so Pages server code is excluded from the upload (via .assetsignore) and is not run. To keep it, migrate it to a Worker: https://developers.cloudflare.com/workers/static-assets/migration-guides/migrate-from-pages/`
+      );
+    }
   }
   if (buildCommand3 && runBuild2) {
     await context2.runCommand(