wrangler 3.72.1 → 3.72.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.72.1",
+  "version": "3.72.2",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -63,15 +63,15 @@
     "selfsigned": "^2.0.1",
     "source-map": "^0.6.1",
     "unenv": "npm:unenv-nightly@1.10.0-1717606461.a117952",
-    "workerd": "1.20240806.0",
+    "workerd": "1.20240821.1",
     "xxhash-wasm": "^1.0.1",
-    "@cloudflare/workers-shared": "0.2.0",
     "@cloudflare/kv-asset-handler": "0.3.4",
-    "miniflare": "3.20240806.1"
+    "@cloudflare/workers-shared": "0.3.0",
+    "miniflare": "3.20240821.0"
   },
   "devDependencies": {
     "@cloudflare/types": "^6.18.4",
-    "@cloudflare/workers-types": "^4.20240806.0",
+    "@cloudflare/workers-types": "^4.20240821.1",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.47.0",
@@ -152,13 +152,13 @@
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
-    "@cloudflare/cli": "1.1.1",
-    "@cloudflare/pages-shared": "^0.11.52",
     "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/cli": "1.1.1",
+    "@cloudflare/pages-shared": "^0.11.53",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20240806.0"
+    "@cloudflare/workers-types": "^4.20240821.1"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {

package/wrangler-dist/cli.d.ts

@@ -975,6 +975,7 @@ declare function deploy({ directory, accountId, projectName, branch, skipCaching
     modified_on: string;
     short_id: string;
     build_image_major_version: number;
+    kv_namespaces?: any;
     source?: {
         type: "github" | "gitlab";
         config: {
@@ -989,7 +990,6 @@ declare function deploy({ directory, accountId, projectName, branch, skipCaching
             preview_branch_excludes?: string[] | undefined;
         };
     } | undefined;
-    kv_namespaces?: any;
     env_vars?: any;
     durable_object_namespaces?: any;
     is_skipped?: boolean | undefined;

package/wrangler-dist/cli.js

@@ -93993,8 +93993,8 @@ function $asStringSmall (str) {
       }
       let code = "return schema";
       if (ref[1]) {
-        const walk2 = ref[1].split("/");
-        if (walk2.length === 1) {
+        const walk = ref[1].split("/");
+        if (walk.length === 1) {
           const targetId = `#${ref[1]}`;
           let dereferenced = idFinder(schema, targetId);
           if (dereferenced === void 0 && !ref[0]) {
@@ -94012,8 +94012,8 @@ function $asStringSmall (str) {
             externalSchema
           };
         } else {
-          for (var i = 1; i < walk2.length; i++) {
-            code += `[${JSON.stringify(walk2[i])}]`;
+          for (var i = 1; i < walk.length; i++) {
+            code += `[${JSON.stringify(walk[i])}]`;
           }
         }
       }
@@ -94023,8 +94023,8 @@ function $asStringSmall (str) {
       } catch (err) {
       }
       if (result === void 0 && ref[1]) {
-        const walk2 = ref[1].split("/");
-        findBadKey(schema, walk2.slice(1));
+        const walk = ref[1].split("/");
+        findBadKey(schema, walk.slice(1));
       }
       if (result.$ref) {
         return refFinder(result.$ref, {
@@ -152693,7 +152693,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.72.1";
+var version = "3.72.2";
 var package_default = {
   name: "wrangler",
   version,
@@ -152781,7 +152781,7 @@ var package_default = {
     selfsigned: "^2.0.1",
     "source-map": "^0.6.1",
     unenv: "npm:unenv-nightly@1.10.0-1717606461.a117952",
-    workerd: "1.20240806.0",
+    workerd: "1.20240821.1",
     "xxhash-wasm": "^1.0.1"
   },
   devDependencies: {
@@ -152790,7 +152790,7 @@ var package_default = {
     "@cloudflare/pages-shared": "workspace:^",
     "@cloudflare/types": "^6.18.4",
     "@cloudflare/workers-tsconfig": "workspace:*",
-    "@cloudflare/workers-types": "^4.20240806.0",
+    "@cloudflare/workers-types": "^4.20240821.1",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.47.0",
@@ -152873,7 +152873,7 @@ var package_default = {
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz"
   },
   peerDependencies: {
-    "@cloudflare/workers-types": "^4.20240806.0"
+    "@cloudflare/workers-types": "^4.20240821.1"
   },
   peerDependenciesMeta: {
     "@cloudflare/workers-types": {
@@ -158108,86 +158108,42 @@ function handleAliasedNodeJSPackages(build5, alias, external) {
 __name(handleAliasedNodeJSPackages, "handleAliasedNodeJSPackages");
 function handleNodeJSGlobals(build5, inject) {
   const UNENV_GLOBALS_RE = /_virtual_unenv_global_polyfill-([^.]+)\.js$/;
+  const prefix = import_node_path8.default.resolve(
+    getBasePath(),
+    "_virtual_unenv_global_polyfill-"
+  );
   build5.initialOptions.inject = [
     ...build5.initialOptions.inject ?? [],
     //convert unenv's inject keys to absolute specifiers of custom virtual modules that will be provided via a custom onLoad
     ...Object.keys(inject).map(
-      (globalName) => import_node_path8.default.resolve(
-        getBasePath(),
-        `_virtual_unenv_global_polyfill-${encodeToLowerCase(globalName)}.js`
-      )
+      (globalName) => `${prefix}${encodeToLowerCase(globalName)}.js`
     )
   ];
   build5.onResolve({ filter: UNENV_GLOBALS_RE }, ({ path: path74 }) => ({ path: path74 }));
   build5.onLoad({ filter: UNENV_GLOBALS_RE }, ({ path: path74 }) => {
     const globalName = decodeFromLowerCase(path74.match(UNENV_GLOBALS_RE)[1]);
-    const globalMapping = inject[globalName];
-    if (typeof globalMapping === "string") {
-      const globalPolyfillSpecifier = globalMapping;
-      return {
-        contents: `
-								import globalVar from "${globalPolyfillSpecifier}";
-
-								${/*
-        // ESBuild's inject doesn't actually touch globalThis, so let's do it ourselves
-        // by creating an exportable so that we can preserve the globalThis assignment if
-        // the ${globalName} was found in the app, or tree-shake it, if it wasn't
-        // see https://esbuild.github.io/api/#inject
-        */
-        ""}
-								const exportable =
-									${/*
-        // mark this as a PURE call so it can be ignored and tree-shaken by ESBuild,
-        // when we don't detect 'process', 'global.process', or 'globalThis.process'
-        // in the app code
-        // see https://esbuild.github.io/api/#tree-shaking-and-side-effects
-        */
-        ""}
-									/* @__PURE__ */ (() => {
-										return globalThis.${globalName} = globalVar;
-									})();
-
-								export {
-									exportable as '${globalName}',
-									exportable as 'globalThis.${globalName}',
-								}
-							`
-      };
-    }
-    const [moduleName, exportName] = inject[globalName];
+    const { importStatement, exportName } = getGlobalInject(inject[globalName]);
     return {
-      contents: `
-							import { ${exportName} } from "${moduleName}";
-
-							${/*
-      // ESBuild's inject doesn't actually touch globalThis, so let's do it ourselves
-      // by creating an exportable so that we can preserve the globalThis assignment if
-      // the ${globalName} was found in the app, or tree-shake it, if it wasn't
-      // see https://esbuild.github.io/api/#inject
-      */
-      ""}
-							const exportable =
-								${/*
-      // mark this as a PURE call so it can be ignored and tree-shaken by ESBuild,
-      // when we don't detect 'process', 'global.process', or 'globalThis.process'
-      // in the app code
-      // see https://esbuild.github.io/api/#tree-shaking-and-side-effects
-      */
-      ""}
-								/* @__PURE__ */ (() => {
-									return globalThis.${globalName} = ${exportName};
-							})();
-
-							export {
-								exportable as '${globalName}',
-								exportable as 'global.${globalName}',
-								exportable as 'globalThis.${globalName}'
-							}
-						`
+      contents: `${importStatement}
+globalThis.${globalName} = ${exportName};`
     };
   });
 }
 __name(handleNodeJSGlobals, "handleNodeJSGlobals");
+function getGlobalInject(globalInject) {
+  if (typeof globalInject === "string") {
+    return {
+      importStatement: `import globalVar from "${globalInject}";`,
+      exportName: "globalVar"
+    };
+  }
+  const [moduleSpecifier, exportName] = globalInject;
+  return {
+    importStatement: `import { ${exportName} } from "${moduleSpecifier}";`,
+    exportName
+  };
+}
+__name(getGlobalInject, "getGlobalInject");
 function encodeToLowerCase(str) {
   return str.replaceAll(/\$/g, () => "$$").replaceAll(/[A-Z]/g, (letter) => `$${letter.toLowerCase()}`);
 }
@@ -159542,9 +159498,6 @@ function validateNodeCompat({
     node_compat: legacyNodeCompat
   });
   const nodejsCompatV2NotExperimental = compatibilityFlags.includes("nodejs_compat_v2");
-  if (nodejsCompatV2) {
-    compatibilityFlags[compatibilityFlags.indexOf("experimental:nodejs_compat_v2")] = "nodejs_compat_v2";
-  }
   if (nodejsCompat && nodejsCompatV2) {
     throw new UserError(
       "The `nodejs_compat` and `nodejs_compat_v2` compatibility flags cannot be used in together. Please select just one."
@@ -159604,6 +159557,10 @@ function getNodeCompatMode({
   };
 }
 __name(getNodeCompatMode, "getNodeCompatMode");
+function stripExperimentalPrefixes(compatFlags) {
+  return compatFlags?.map((flag) => flag.replace(/^experimental:/, ""));
+}
+__name(stripExperimentalPrefixes, "stripExperimentalPrefixes");
 
 // src/dev-registry.ts
 init_import_meta_url();
@@ -162997,7 +162954,9 @@ async function buildMiniflareOptions(log2, config, proxyToUserWorkerAuthenticati
       {
         name: getName(config),
         compatibilityDate: config.compatibilityDate,
-        compatibilityFlags: config.compatibilityFlags,
+        compatibilityFlags: stripExperimentalPrefixes(
+          config.compatibilityFlags
+        ),
         ...sourceOptions,
         ...bindingOptions,
         ...sitesOptions,
@@ -163934,7 +163893,9 @@ function createWorkerUploadForm(worker) {
     ...main2.type !== "commonjs" ? { main_module: main2.name } : { body_part: main2.name },
     bindings: metadataBindings,
     ...compatibility_date && { compatibility_date },
-    ...compatibility_flags && { compatibility_flags },
+    ...compatibility_flags && {
+      compatibility_flags: stripExperimentalPrefixes(compatibility_flags)
+    },
     ...migrations && { migrations },
     capnp_schema: capnpSchemaOutputFile,
     ...keep_bindings && { keep_bindings },
@@ -178611,7 +178572,7 @@ var validate = /* @__PURE__ */ __name(async (args) => {
     "**/.git"
   ].map((pattern) => new import_minimatch.Minimatch(pattern));
   const directory = (0, import_node_path33.resolve)(args.directory);
-  const walk2 = /* @__PURE__ */ __name(async (dir, fileMap2 = /* @__PURE__ */ new Map(), startingDir = dir) => {
+  const walk = /* @__PURE__ */ __name(async (dir, fileMap2 = /* @__PURE__ */ new Map(), startingDir = dir) => {
     const files = await (0, import_promises11.readdir)(dir);
     await Promise.all(
       files.map(async (file) => {
@@ -178627,7 +178588,7 @@ var validate = /* @__PURE__ */ __name(async (args) => {
           return;
         }
         if (filestat.isDirectory()) {
-          fileMap2 = await walk2(filepath, fileMap2, startingDir);
+          fileMap2 = await walk(filepath, fileMap2, startingDir);
         } else {
           const name = relativeFilepath.split(import_node_path33.sep).join("/");
           if (filestat.size > MAX_ASSET_SIZE) {
@@ -178653,7 +178614,7 @@ ${name} is ${prettyBytes(filestat.size, {
     );
     return fileMap2;
   }, "walk");
-  const fileMap = await walk2(directory);
+  const fileMap = await walk(directory);
   if (fileMap.size > MAX_ASSET_COUNT) {
     throw new FatalError(
       `Error: Pages only supports up to ${MAX_ASSET_COUNT.toLocaleString()} files in a deployment. Ensure you have specified your build output directory correctly.`,
@@ -178958,14 +178919,14 @@ __name(Progress, "Progress");
 
 // src/experimental-assets.ts
 var BULK_UPLOAD_CONCURRENCY2 = 3;
-var MAX_ASSET_COUNT2 = 2e4;
-var MAX_ASSET_SIZE2 = 25 * 1024 * 1024;
 var MAX_UPLOAD_ATTEMPTS2 = 5;
 var MAX_UPLOAD_GATEWAY_ERRORS2 = 5;
+var MAX_ASSET_COUNT2 = 2e4;
+var MAX_ASSET_SIZE2 = 25 * 1024 * 1024;
 var syncExperimentalAssets = /* @__PURE__ */ __name(async (accountId, scriptName, assetDirectory) => {
   (0, import_node_assert15.default)(accountId, "Missing accountId");
   logger.info("\u{1F300} Building list of assets...");
-  const manifest = await walk(assetDirectory, {});
+  const manifest = await buildAssetsManifest(assetDirectory);
   logger.info("\u{1F300} Starting asset upload...");
   const initializeAssetsResponse = await fetchResult(
     `/accounts/${accountId}/workers/scripts/${scriptName}/assets-upload-session`,
@@ -179105,24 +179066,22 @@ Assets already uploaded have been saved, so the next attempt will automatically
   );
   return completionJwt;
 }, "syncExperimentalAssets");
-var walk = /* @__PURE__ */ __name(async (dir, manifest, startingDir = dir) => {
-  const files = await (0, import_promises13.readdir)(dir);
+var buildAssetsManifest = /* @__PURE__ */ __name(async (dir) => {
+  const files = await (0, import_promises13.readdir)(dir, { recursive: true });
+  const manifest = {};
   let counter = 0;
   await Promise.all(
     files.map(async (file) => {
       const filepath = path39.join(dir, file);
-      const relativeFilepath = path39.relative(startingDir, filepath);
+      const relativeFilepath = path39.relative(dir, filepath);
       const filestat = await (0, import_promises13.stat)(filepath);
-      if (filestat.isSymbolicLink()) {
+      if (filestat.isSymbolicLink() || filestat.isDirectory()) {
         return;
-      }
-      if (filestat.isDirectory()) {
-        manifest = await walk(filepath, manifest, startingDir);
       } else {
         if (counter >= MAX_ASSET_COUNT2) {
           throw new UserError(
             `Maximum number of assets exceeded.
-Cloudflare Workers supports up to ${MAX_ASSET_COUNT2.toLocaleString()} assets in a version. We found ${counter.toLocaleString()} files in the specified assets directory "${startingDir}".
+Cloudflare Workers supports up to ${MAX_ASSET_COUNT2.toLocaleString()} assets in a version. We found ${counter.toLocaleString()} files in the specified assets directory "${dir}".
 Ensure your assets directory contains a maximum of ${MAX_ASSET_COUNT2.toLocaleString()} files, and that you have specified your assets directory correctly.`
           );
         }
@@ -179140,7 +179099,7 @@ Cloudflare Workers supports assets with sizes of up to ${prettyBytes(
                 binary: true
               }
             )}.
-Ensure all assets in your assets directory "${startingDir}" conform with the Workers maximum size requirement.`
+Ensure all assets in your assets directory "${dir}" conform with the Workers maximum size requirement.`
           );
         }
         manifest[encodeFilePath(relativeFilepath)] = {
@@ -179152,7 +179111,7 @@ Ensure all assets in your assets directory "${startingDir}" conform with the Wor
     })
   );
   return manifest;
-}, "walk");
+}, "buildAssetsManifest");
 var MAX_DIFF_LINES = 100;
 function logAssetUpload(line, diffCount) {
   const level = logger.loggerLevel;
@@ -181993,71 +181952,7 @@ function buildWorkerFromFunctions({
     doBindings: [],
     // Pages functions don't support internal Durable Objects
     external,
-    plugins: [
-      buildNotifierPlugin(onEnd),
-      {
-        name: "Assets",
-        setup(pluginBuild) {
-          const identifiers = /* @__PURE__ */ new Map();
-          pluginBuild.onResolve({ filter: /^assets:/ }, async (args) => {
-            const directory = (0, import_node_path41.resolve)(
-              args.resolveDir,
-              args.path.slice("assets:".length)
-            );
-            const exists = await (0, import_promises15.access)(directory).then(() => true).catch(() => false);
-            const isDirectory2 = exists && (await (0, import_promises15.lstat)(directory)).isDirectory();
-            if (!isDirectory2) {
-              return {
-                errors: [
-                  {
-                    text: `'${directory}' does not exist or is not a directory.`
-                  }
-                ]
-              };
-            }
-            identifiers.set(directory, nanoid());
-            if (!buildOutputDirectory) {
-              console.warn(
-                "You're attempting to import static assets as part of your Pages Functions, but have not specified a directory in which to put them. You must use 'wrangler pages dev <directory>' rather than 'wrangler pages dev -- <command>' to import static assets in Functions."
-              );
-            }
-            return { path: directory, namespace: "assets" };
-          });
-          pluginBuild.onLoad(
-            { filter: /.*/, namespace: "assets" },
-            async (args) => {
-              const identifier = identifiers.get(args.path);
-              if (buildOutputDirectory) {
-                const staticAssetsOutputDirectory = (0, import_node_path41.join)(
-                  buildOutputDirectory,
-                  "cdn-cgi",
-                  "pages-plugins",
-                  identifier
-                );
-                await (0, import_promises15.rm)(staticAssetsOutputDirectory, {
-                  force: true,
-                  recursive: true
-                });
-                await (0, import_promises15.cp)(args.path, staticAssetsOutputDirectory, {
-                  force: true,
-                  recursive: true
-                });
-                return {
-                  // TODO: Watch args.path for changes and re-copy when updated
-                  contents: `export const onRequest = ({ request, env, functionPath }) => {
-                    const url = new URL(request.url)
-                    const relativePathname = \`/\${url.pathname.replace(functionPath, "") || ""}\`.replace(/^\\/\\//, '/');
-                    url.pathname = '/cdn-cgi/pages-plugins/${identifier}' + relativePathname
-                    request = new Request(url.toString(), request)
-                    return env.ASSETS.fetch(request)
-                  }`
-                };
-              }
-            }
-          );
-        }
-      }
-    ],
+    plugins: [buildNotifierPlugin(onEnd), assetsPlugin(buildOutputDirectory)],
     isOutfile: !outdir,
     serveLegacyAssetsFromWorker: false,
     checkFetch: local,
@@ -182260,6 +182155,71 @@ function blockWorkerJsImports(nodejsCompatMode) {
   };
 }
 __name(blockWorkerJsImports, "blockWorkerJsImports");
+function assetsPlugin(buildOutputDirectory) {
+  return {
+    name: "Assets",
+    setup(pluginBuild) {
+      const identifiers = /* @__PURE__ */ new Map();
+      pluginBuild.onResolve({ filter: /^assets:/ }, async (args) => {
+        const directory = (0, import_node_path41.resolve)(
+          args.resolveDir,
+          args.path.slice("assets:".length)
+        );
+        const exists = await (0, import_promises15.access)(directory).then(() => true).catch(() => false);
+        const isDirectory2 = exists && (await (0, import_promises15.lstat)(directory)).isDirectory();
+        if (!isDirectory2) {
+          return {
+            errors: [
+              {
+                text: `'${directory}' does not exist or is not a directory.`
+              }
+            ]
+          };
+        }
+        identifiers.set(directory, nanoid());
+        if (!buildOutputDirectory) {
+          console.warn(
+            "You're attempting to import static assets as part of your Pages Functions, but have not specified a directory in which to put them. You must use 'wrangler pages dev <directory>' rather than 'wrangler pages dev -- <command>' to import static assets in Functions."
+          );
+        }
+        return { path: directory, namespace: "assets" };
+      });
+      pluginBuild.onLoad(
+        { filter: /.*/, namespace: "assets" },
+        async (args) => {
+          const identifier = identifiers.get(args.path);
+          if (buildOutputDirectory) {
+            const staticAssetsOutputDirectory = (0, import_node_path41.join)(
+              buildOutputDirectory,
+              "cdn-cgi",
+              "pages-plugins",
+              identifier
+            );
+            await (0, import_promises15.rm)(staticAssetsOutputDirectory, {
+              force: true,
+              recursive: true
+            });
+            await (0, import_promises15.cp)(args.path, staticAssetsOutputDirectory, {
+              force: true,
+              recursive: true
+            });
+            return {
+              // TODO: Watch args.path for changes and re-copy when updated
+              contents: `export const onRequest = ({ request, env, functionPath }) => {
+								const url = new URL(request.url);
+								const relativePathname = \`/\${url.pathname.replace(functionPath, "") || ""}\`.replace(/^\\/\\//, '/');
+								url.pathname = '/cdn-cgi/pages-plugins/${identifier}' + relativePathname;
+								request = new Request(url.toString(), request);
+								return env.ASSETS.fetch(request);
+							}`
+            };
+          }
+        }
+      );
+    }
+  };
+}
+__name(assetsPlugin, "assetsPlugin");
 
 // src/pages/functions/buildPlugin.ts
 function buildPluginFromFunctions({
@@ -205446,12 +205406,12 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
   const jsxFragment = props.jsxFragment || config.jsx_fragment;
   const keepVars = props.keepVars || config.keep_vars;
   const minify = props.minify ?? config.minify;
+  const compatibilityFlags = props.compatibilityFlags ?? config.compatibility_flags;
   const nodejsCompatMode = validateNodeCompat({
     legacyNodeCompat: props.nodeCompat ?? config.node_compat ?? false,
-    compatibilityFlags: props.compatibilityFlags ?? config.compatibility_flags,
+    compatibilityFlags,
     noBundle: props.noBundle ?? config.no_bundle ?? false
   });
-  const compatibilityFlags = props.compatibilityFlags ?? config.compatibility_flags;
   if (props.noBundle && minify) {
     logger.warn(
       "`--minify` and `--no-bundle` can't be used together. If you want to minify your Worker and disable Wrangler's bundling, please minify as part of your own bundling process."
@@ -207172,7 +207132,7 @@ async function createRemoteWorkerInit(props) {
     migrations: void 0,
     // no migrations in dev
     compatibility_date: props.compatibilityDate,
-    compatibility_flags: props.compatibilityFlags,
+    compatibility_flags: stripExperimentalPrefixes(props.compatibilityFlags),
     keepVars: true,
     keepSecrets: true,
     logpush: false,