wrangler 3.78.5 → 3.78.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.78.5",
+  "version": "3.78.7",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -62,12 +62,12 @@
     "resolve.exports": "^2.0.2",
     "selfsigned": "^2.0.1",
     "source-map": "^0.6.1",
-    "unenv": "npm:unenv-nightly@2.0.0-1726478054.1e87097",
+    "unenv": "npm:unenv-nightly@2.0.0-20240919-125358-9a64854",
     "workerd": "1.20240909.0",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.4",
     "@cloudflare/workers-shared": "0.5.3",
-    "miniflare": "3.20240909.3"
+    "miniflare": "3.20240909.4"
   },
   "devDependencies": {
     "@cloudflare/types": "^6.18.4",
@@ -154,7 +154,7 @@
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "^0.11.59",
+    "@cloudflare/pages-shared": "^0.11.60",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {

package/wrangler-dist/cli.js

@@ -72329,7 +72329,7 @@ var init_execa = __esm({
 var require_depd = __commonJS({
   "../../node_modules/.pnpm/depd@2.0.0/node_modules/depd/index.js"(exports2, module3) {
     init_import_meta_url();
-    var relative16 = require("path").relative;
+    var relative15 = require("path").relative;
     module3.exports = depd;
     var basePath = process.cwd();
     function containsNamespace(str, namespace) {
@@ -72535,7 +72535,7 @@ var require_depd = __commonJS({
     }
     __name(formatColor, "formatColor");
     function formatLocation(callSite) {
-      return relative16(basePath, callSite[0]) + ":" + callSite[1] + ":" + callSite[2];
+      return relative15(basePath, callSite[0]) + ":" + callSite[1] + ":" + callSite[2];
     }
     __name(formatLocation, "formatLocation");
     function getStack() {
@@ -95511,51 +95511,51 @@ var require_uri_all = __commonJS({
         return uriTokens.join("");
       }
       __name(serialize, "serialize");
-      function resolveComponents(base2, relative16) {
+      function resolveComponents(base2, relative15) {
         var options29 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
         var skipNormalization = arguments[3];
         var target = {};
         if (!skipNormalization) {
           base2 = parse7(serialize(base2, options29), options29);
-          relative16 = parse7(serialize(relative16, options29), options29);
+          relative15 = parse7(serialize(relative15, options29), options29);
         }
         options29 = options29 || {};
-        if (!options29.tolerant && relative16.scheme) {
-          target.scheme = relative16.scheme;
-          target.userinfo = relative16.userinfo;
-          target.host = relative16.host;
-          target.port = relative16.port;
-          target.path = removeDotSegments(relative16.path || "");
-          target.query = relative16.query;
+        if (!options29.tolerant && relative15.scheme) {
+          target.scheme = relative15.scheme;
+          target.userinfo = relative15.userinfo;
+          target.host = relative15.host;
+          target.port = relative15.port;
+          target.path = removeDotSegments(relative15.path || "");
+          target.query = relative15.query;
         } else {
-          if (relative16.userinfo !== void 0 || relative16.host !== void 0 || relative16.port !== void 0) {
-            target.userinfo = relative16.userinfo;
-            target.host = relative16.host;
-            target.port = relative16.port;
-            target.path = removeDotSegments(relative16.path || "");
-            target.query = relative16.query;
+          if (relative15.userinfo !== void 0 || relative15.host !== void 0 || relative15.port !== void 0) {
+            target.userinfo = relative15.userinfo;
+            target.host = relative15.host;
+            target.port = relative15.port;
+            target.path = removeDotSegments(relative15.path || "");
+            target.query = relative15.query;
           } else {
-            if (!relative16.path) {
+            if (!relative15.path) {
               target.path = base2.path;
-              if (relative16.query !== void 0) {
-                target.query = relative16.query;
+              if (relative15.query !== void 0) {
+                target.query = relative15.query;
               } else {
                 target.query = base2.query;
               }
             } else {
-              if (relative16.path.charAt(0) === "/") {
-                target.path = removeDotSegments(relative16.path);
+              if (relative15.path.charAt(0) === "/") {
+                target.path = removeDotSegments(relative15.path);
               } else {
                 if ((base2.userinfo !== void 0 || base2.host !== void 0 || base2.port !== void 0) && !base2.path) {
-                  target.path = "/" + relative16.path;
+                  target.path = "/" + relative15.path;
                 } else if (!base2.path) {
-                  target.path = relative16.path;
+                  target.path = relative15.path;
                 } else {
-                  target.path = base2.path.slice(0, base2.path.lastIndexOf("/") + 1) + relative16.path;
+                  target.path = base2.path.slice(0, base2.path.lastIndexOf("/") + 1) + relative15.path;
                 }
                 target.path = removeDotSegments(target.path);
               }
-              target.query = relative16.query;
+              target.query = relative15.query;
             }
             target.userinfo = base2.userinfo;
             target.host = base2.host;
@@ -95563,7 +95563,7 @@ var require_uri_all = __commonJS({
           }
           target.scheme = base2.scheme;
         }
-        target.fragment = relative16.fragment;
+        target.fragment = relative15.fragment;
         return target;
       }
       __name(resolveComponents, "resolveComponents");
@@ -152543,9 +152543,9 @@ function getEnvironmentVariableFactory({
 }) {
   let hasWarned = false;
   return () => {
-    if (process.env[variableName]) {
+    if (variableName in process.env) {
       return process.env[variableName];
-    } else if (deprecatedName && process.env[deprecatedName]) {
+    } else if (deprecatedName && deprecatedName in process.env) {
       if (!hasWarned) {
         hasWarned = true;
         console.warn(
@@ -152595,6 +152595,12 @@ var getOutputFilePathFromEnv = getEnvironmentVariableFactory({
 var getCIMatchTag = getEnvironmentVariableFactory({
   variableName: "WRANGLER_CI_MATCH_TAG"
 });
+var getBuildConditionsFromEnv = getEnvironmentVariableFactory({
+  variableName: "WRANGLER_BUILD_CONDITIONS"
+});
+var getBuildPlatformFromEnv = getEnvironmentVariableFactory({
+  variableName: "WRANGLER_BUILD_PLATFORM"
+});
 
 // src/utils/log-file.ts
 init_import_meta_url();
@@ -152876,7 +152882,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.78.5";
+var version = "3.78.7";
 var package_default = {
   name: "wrangler",
   version,
@@ -152963,7 +152969,7 @@ var package_default = {
     "resolve.exports": "^2.0.2",
     selfsigned: "^2.0.1",
     "source-map": "^0.6.1",
-    unenv: "npm:unenv-nightly@2.0.0-1726478054.1e87097",
+    unenv: "npm:unenv-nightly@2.0.0-20240919-125358-9a64854",
     workerd: "1.20240909.0",
     "xxhash-wasm": "^1.0.1"
   },
@@ -160608,7 +160614,7 @@ function createModuleCollector(props) {
                       packageJson,
                       args.path.replace(`${packageName}/`, ""),
                       {
-                        conditions: BUILD_CONDITIONS
+                        conditions: getBuildConditions()
                       }
                     );
                     if (testResolved) {
@@ -160993,7 +160999,25 @@ var COMMON_ESBUILD_OPTIONS = {
   target: "es2022",
   loader: { ".js": "jsx", ".mjs": "jsx", ".cjs": "jsx" }
 };
-var BUILD_CONDITIONS = ["workerd", "worker", "browser"];
+function getBuildConditions() {
+  const envVar = getBuildConditionsFromEnv();
+  if (envVar !== void 0) {
+    return envVar.split(",");
+  } else {
+    return ["workerd", "worker", "browser"];
+  }
+}
+__name(getBuildConditions, "getBuildConditions");
+function getBuildPlatform() {
+  const platform2 = getBuildPlatformFromEnv();
+  if (platform2 !== void 0 && !["browser", "node", "neutral"].includes(platform2)) {
+    throw new UserError(
+      "Invalid esbuild platform configuration defined in the WRANGLER_BUILD_PLATFORM environment variable.\nValid platform values are: 'browser', 'node' and 'neutral'."
+    );
+  }
+  return platform2;
+}
+__name(getBuildPlatform, "getBuildPlatform");
 async function bundleWorker(entry, destination, {
   bundle,
   moduleCollector = noopModuleCollector,
@@ -161162,7 +161186,8 @@ async function bundleWorker(entry, destination, {
     sourceRoot: destination,
     minify,
     metafile: true,
-    conditions: BUILD_CONDITIONS,
+    conditions: getBuildConditions(),
+    platform: getBuildPlatform(),
     ...{
       define: {
         ...defineNavigatorUserAgent ? { "navigator.userAgent": `"Cloudflare-Workers"` } : {},
@@ -166736,7 +166761,7 @@ var MAX_UPLOAD_GATEWAY_ERRORS2 = 5;
 var syncExperimentalAssets = /* @__PURE__ */ __name(async (accountId, scriptName, assetDirectory) => {
   (0, import_node_assert9.default)(accountId, "Missing accountId");
   logger.info("\u{1F300} Building list of assets...");
-  const manifest = await buildAssetsManifest(assetDirectory);
+  const manifest = await buildAssetManifest(assetDirectory);
   logger.info("\u{1F300} Starting asset upload...");
   const initializeAssetsResponse = await fetchResult(
     `/accounts/${accountId}/workers/scripts/${scriptName}/assets-upload-session`,
@@ -166878,23 +166903,23 @@ Assets already uploaded have been saved, so the next attempt will automatically
   );
   return completionJwt;
 }, "syncExperimentalAssets");
-var buildAssetsManifest = /* @__PURE__ */ __name(async (dir) => {
+var buildAssetManifest = /* @__PURE__ */ __name(async (dir) => {
   const files = await (0, import_promises8.readdir)(dir, { recursive: true });
   const manifest = {};
   let counter = 0;
   const ignoreFn = await createAssetIgnoreFunction(dir);
   await Promise.all(
-    files.map(async (file) => {
-      const filepath = path16.join(dir, file);
-      const relativeFilepath = path16.relative(dir, filepath);
+    files.map(async (relativeFilepath) => {
       if (ignoreFn?.(relativeFilepath)) {
         logger.debug("Ignoring asset:", relativeFilepath);
         return;
       }
+      const filepath = path16.join(dir, relativeFilepath);
       const filestat = await (0, import_promises8.stat)(filepath);
       if (filestat.isSymbolicLink() || filestat.isDirectory()) {
         return;
       } else {
+        errorOnLegacyPagesWorkerJSAsset(relativeFilepath, !!ignoreFn);
         if (counter >= MAX_ASSET_COUNT2) {
           throw new UserError(
             `Maximum number of assets exceeded.
@@ -166928,7 +166953,7 @@ Ensure all assets in your assets directory "${dir}" conform with the Workers max
     })
   );
   return manifest;
-}, "buildAssetsManifest");
+}, "buildAssetManifest");
 var MAX_DIFF_LINES = 100;
 function logAssetUpload(line, diffCount) {
   const level = logger.loggerLevel;
@@ -166949,38 +166974,37 @@ function getExperimentalAssetsBasePath(config, experimentalAssetsCommandLineArg)
 __name(getExperimentalAssetsBasePath, "getExperimentalAssetsBasePath");
 function processExperimentalAssetsArg(args, config) {
   const experimentalAssets = args.experimentalAssets ? { directory: args.experimentalAssets } : config.experimental_assets;
-  let experimentalAssetsOptions;
-  if (experimentalAssets) {
-    const experimentalAssetsBasePath = getExperimentalAssetsBasePath(
-      config,
-      args.experimentalAssets
-    );
-    const resolvedExperimentalAssetsPath = path16.resolve(
-      experimentalAssetsBasePath,
-      experimentalAssets.directory
-    );
-    if (!(0, import_node_fs11.existsSync)(resolvedExperimentalAssetsPath)) {
-      const sourceOfTruthMessage = args.experimentalAssets ? '"--experimental-assets" command line argument' : '"experimental_assets.directory" field in your configuration file';
-      throw new UserError(
-        `The directory specified by the ${sourceOfTruthMessage} does not exist:
+  if (!experimentalAssets) {
+    return;
+  }
+  const experimentalAssetsBasePath = getExperimentalAssetsBasePath(
+    config,
+    args.experimentalAssets
+  );
+  const resolvedExperimentalAssetsPath = path16.resolve(
+    experimentalAssetsBasePath,
+    experimentalAssets.directory
+  );
+  if (!(0, import_node_fs11.existsSync)(resolvedExperimentalAssetsPath)) {
+    const sourceOfTruthMessage = args.experimentalAssets ? '"--experimental-assets" command line argument' : '"experimental_assets.directory" field in your configuration file';
+    throw new UserError(
+      `The directory specified by the ${sourceOfTruthMessage} does not exist:
 ${resolvedExperimentalAssetsPath}`
-      );
-    }
-    experimentalAssets.directory = resolvedExperimentalAssetsPath;
-    const routingConfig = {
-      has_user_worker: Boolean(args.script || config.main)
-    };
-    const assetConfig = {
-      html_handling: config.experimental_assets?.html_handling,
-      not_found_handling: config.experimental_assets?.not_found_handling
-    };
-    experimentalAssetsOptions = {
-      ...experimentalAssets,
-      routingConfig,
-      assetConfig
-    };
+    );
   }
-  return experimentalAssetsOptions;
+  experimentalAssets.directory = resolvedExperimentalAssetsPath;
+  const routingConfig = {
+    has_user_worker: Boolean(args.script || config.main)
+  };
+  const assetConfig = {
+    html_handling: config.experimental_assets?.html_handling,
+    not_found_handling: config.experimental_assets?.not_found_handling
+  };
+  return {
+    ...experimentalAssets,
+    routingConfig,
+    assetConfig
+  };
 }
 __name(processExperimentalAssetsArg, "processExperimentalAssetsArg");
 function verifyMutuallyExclusiveAssetsArgsOrConfig(args, config) {
@@ -167001,8 +167025,8 @@ function verifyMutuallyExclusiveAssetsArgsOrConfig(args, config) {
   }
 }
 __name(verifyMutuallyExclusiveAssetsArgsOrConfig, "verifyMutuallyExclusiveAssetsArgsOrConfig");
+var CF_ASSETS_IGNORE_FILENAME = ".assetsignore";
 async function createAssetIgnoreFunction(dir) {
-  const CF_ASSETS_IGNORE_FILENAME = ".assetsignore";
   const cfAssetIgnorePath = path16.resolve(dir, CF_ASSETS_IGNORE_FILENAME);
   if (!(0, import_node_fs11.existsSync)(cfAssetIgnorePath)) {
     return null;
@@ -167012,6 +167036,20 @@ async function createAssetIgnoreFunction(dir) {
   return createPatternMatcher(ignorePatterns, true);
 }
 __name(createAssetIgnoreFunction, "createAssetIgnoreFunction");
+function errorOnLegacyPagesWorkerJSAsset(file, hasAssetsIgnoreFile) {
+  if (!hasAssetsIgnoreFile) {
+    const workerJsType = file === "_worker.js" ? "file" : file.startsWith("_worker.js") ? "directory" : null;
+    if (workerJsType !== null) {
+      throw new UserError(dedent2`
+			Uploading a Pages _worker.js ${workerJsType} as an asset.
+			This could expose your private server-side code to the public Internet. Is this intended?
+			If you do not want to upload this ${workerJsType}, either remove it or add an "${CF_ASSETS_IGNORE_FILENAME}" file, to the root of your asset directory, containing "_worker.js" to avoid uploading.
+			If you do want to upload this ${workerJsType}, you can add an empty "${CF_ASSETS_IGNORE_FILENAME}" file, to the root of your asset directory, to hide this error.
+		`);
+    }
+  }
+}
+__name(errorOnLegacyPagesWorkerJSAsset, "errorOnLegacyPagesWorkerJSAsset");
 
 // src/metrics/index.ts
 init_import_meta_url();
@@ -172587,7 +172625,10 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
           await patchNonVersionedScriptSettings(accountId, scriptName, {
             tail_consumers: worker.tail_consumers,
             logpush: worker.logpush,
-            observability: worker.observability
+            // If the user hasn't specified observability assume that they want it disabled if they have it on.
+            // This is a no-op in the event that they don't have observability enabled, but will remove observability
+            // if it has been removed from their wrangler.toml
+            observability: worker.observability ?? { enabled: false }
           });
           const { available_on_subdomain } = await fetchResult(`/accounts/${accountId}/workers/scripts/${scriptName}/subdomain`);
           result = {
@@ -189304,26 +189345,39 @@ var import_node_path39 = __toESM(require("node:path"));
 
 // src/match-tag.ts
 init_import_meta_url();
-async function verifyWorkerMatchesCITag(accountId, workerName) {
+async function verifyWorkerMatchesCITag(accountId, workerName, configPath) {
   const matchTag = getCIMatchTag();
+  logger.debug(
+    `Starting verifyWorkerMatchesCITag() with tag: ${matchTag}, name: ${workerName}`
+  );
   if (!matchTag) {
+    logger.debug(
+      "No WRANGLER_CI_MATCH_TAG variable provided, aborting verifyWorkerMatchesCITag()"
+    );
     return;
   }
+  const envAccountID = getCloudflareAccountIdFromEnv();
+  if (accountId !== envAccountID) {
+    throw new FatalError(
+      `The \`account_id\` in \`${configPath ?? "wrangler.toml"}\` must match the \`account_id\` for this account. Please update your wrangler.toml with \`account_id = "${envAccountID}"\``
+    );
+  }
   let tag;
   try {
     const worker = await fetchResult(
       `/accounts/${accountId}/workers/services/${workerName}`
     );
     tag = worker.default_environment.script.tag;
+    logger.debug(`API returned with tag: ${tag} for worker: ${workerName}`);
   } catch (e3) {
     logger.debug(e3);
     if (e3.code === 10090) {
       throw new FatalError(
-        `Your Worker's name (${workerName}) does not match what is expected by the CI system`
+        `The name in \`${configPath ?? "wrangler.toml"}\` (${workerName}) must match the name of your Worker. Please update the name field in your wrangler.toml.`
       );
     } else {
       throw new FatalError(
-        "Wrangler cannot validate that your Worker name matches what is expected by the CI system"
+        "Wrangler cannot validate that your Worker name matches what is expected by the build system. Please retry the build."
       );
     }
   }
@@ -189332,7 +189386,7 @@ async function verifyWorkerMatchesCITag(accountId, workerName) {
       `Failed to match Worker tag. The API returned "${tag}", but the CI system expected "${matchTag}"`
     );
     throw new FatalError(
-      `Your Worker's name (${workerName}) does not match what is expected by the CI system`
+      `The name in \`${configPath ?? "wrangler.toml"}\` (${workerName}) must match the name of your Worker. Please update the name field in your wrangler.toml.`
     );
   }
 }
@@ -189569,7 +189623,11 @@ Please shift to the --legacy-assets command to preserve the current functionalit
   );
   if (!args.dryRun) {
     (0, import_node_assert21.default)(accountId, "Missing account ID");
-    await verifyWorkerMatchesCITag(accountId, name);
+    await verifyWorkerMatchesCITag(
+      accountId,
+      name,
+      import_node_path39.default.relative(entry.directory, config.configPath ?? "wrangler.toml")
+    );
   }
   const { sourceMapSize, versionId, workerTag, targets } = await deploy({
     config,
@@ -210210,7 +210268,8 @@ async function typesHandler(args) {
     browser: config.browser,
     ai: config.ai,
     version_metadata: config.version_metadata,
-    secrets
+    secrets,
+    experimental_assets: config.experimental_assets
   };
   await generateTypes(
     configBindingsWithSecrets,
@@ -210402,6 +210461,11 @@ async function generateTypes(configToDTS, config, envInterface, outputPath) {
       `${configToDTS.version_metadata.binding}: { id: string; tag: string };`
     );
   }
+  if (configToDTS.experimental_assets?.binding) {
+    envTypeStructure.push(
+      constructType(configToDTS.experimental_assets.binding, "Fetcher")
+    );
+  }
   const modulesTypeStructure = [];
   if (configToDTS.rules) {
     const moduleTypeMap = {
@@ -212889,7 +212953,11 @@ async function versionsUploadHandler(args) {
   );
   if (!args.dryRun) {
     (0, import_node_assert23.default)(accountId, "Missing account ID");
-    await verifyWorkerMatchesCITag(accountId, name);
+    await verifyWorkerMatchesCITag(
+      accountId,
+      name,
+      import_node_path62.default.relative(entry.directory, config.configPath ?? "wrangler.toml")
+    );
   }
   if (!args.dryRun) {
     await standardPricingWarning2(config);
@@ -214481,6 +214549,11 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
         "Cannot use Legacy Assets and Workers Sites in the same Worker."
       );
     }
+    if ((args.experimentalAssets || config.experimental_assets) && args.remote) {
+      throw new UserError(
+        "Cannot use Experimental Assets in remote mode. Workers with assets are only supported in local mode. Please use `wrangler dev`."
+      );
+    }
     verifyMutuallyExclusiveAssetsArgsOrConfig(args, config);
     let experimentalAssetsOptions = processExperimentalAssetsArg(args, config);
     if (experimentalAssetsOptions) {
@@ -214675,12 +214748,22 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
             return;
           }
           logger.log(`${import_node_path63.default.basename(config.configPath)} changed...`);
+          entry = await getEntry(
+            {
+              legacyAssets: args.legacyAssets,
+              script: args.script,
+              moduleRoot: args.moduleRoot,
+              experimentalAssets: args.experimentalAssets
+            },
+            config,
+            "dev"
+          );
+          experimentalAssetsOptions = processExperimentalAssetsArg(
+            args,
+            config
+          );
           if (experimentalAssetsOptions && !args.experimentalAssets) {
             await assetsWatcher?.close();
-            experimentalAssetsOptions = processExperimentalAssetsArg(
-              args,
-              config
-            );
             if (experimentalAssetsOptions) {
               assetsWatcher = (0, import_chokidar6.watch)(experimentalAssetsOptions.directory, {
                 persistent: true,
@@ -214698,8 +214781,9 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
         }
       });
     }
+    const devServerSettings = await validateDevServerSettings(args, config);
+    let { entry } = devServerSettings;
     const {
-      entry,
       upstreamProtocol,
       host,
       routes,
@@ -214711,7 +214795,7 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
       localPersistencePath,
       processEntrypoint,
       additionalModules
-    } = await validateDevServerSettings(args, config);
+    } = devServerSettings;
     const nodejsCompatMode = getNodeCompatMode(
       args.compatibilityFlags ?? config.compatibility_flags ?? [],
       {
@@ -217408,15 +217492,19 @@ function unstable_getMiniflareWorkerOptions(configPath, env7) {
     );
   }
   if (bindings.durable_objects !== void 0) {
+    const classNameToUseSQLite = getClassNamesWhichUseSQLite(config.migrations);
     bindingOptions.durableObjects = Object.fromEntries(
-      bindings.durable_objects.bindings.map((binding) => [
-        binding.name,
-        {
-          className: binding.class_name,
-          scriptName: binding.script_name,
-          binding
-        }
-      ])
+      bindings.durable_objects.bindings.map((binding) => {
+        const useSQLite = classNameToUseSQLite.get(binding.class_name);
+        return [
+          binding.name,
+          {
+            className: binding.class_name,
+            scriptName: binding.script_name,
+            useSQLite
+          }
+        ];
+      })
     );
   }
   const legacyAssetPaths = config.legacy_assets ? getLegacyAssetPaths(config, void 0) : getSiteAssetPaths(config);