wrangler 3.25.0 → 3.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.25.0",
+  "version": "3.26.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -96,7 +96,7 @@
     "selfsigned": "^2.0.1",
     "source-map": "0.6.1",
     "xxhash-wasm": "^1.0.1",
-    "miniflare": "3.20231218.4"
+    "miniflare": "3.20240129.0"
   },
   "devDependencies": {
     "@cloudflare/ai": "^1.0.35",
@@ -187,7 +187,7 @@
     "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.9",
+    "@cloudflare/pages-shared": "^0.11.10",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {

package/wrangler-dist/cli.d.ts

@@ -141,6 +141,10 @@ export declare type BindingsProxy<Bindings = Record<string, unknown>> = {
      * Object containing the various proxies
      */
     bindings: Bindings;
+    /**
+     * Caches object emulating the Workers Cache runtime API
+     */
+    caches: CacheStorage_3;
     /**
      * Function used to dispose of the child process providing the bindings implementation
      */
@@ -294,12 +298,29 @@ declare interface Cache_2 {
     keys (request?: RequestInfo_2, options?: CacheQueryOptions_2): Promise<readonly Request_2[]>
 }
 
+/**
+ * No-op implementation of Cache
+ */
+declare class Cache_3 {
+    delete(request: CacheRequest, options?: CacheQueryOptions_3): Promise<boolean>;
+    match(request: CacheRequest, options?: CacheQueryOptions_3): Promise<CacheResponse | undefined>;
+    put(request: CacheRequest, response: CacheResponse): Promise<void>;
+}
+
 declare interface CacheQueryOptions_2 {
     ignoreSearch?: boolean,
     ignoreMethod?: boolean,
     ignoreVary?: boolean
 }
 
+declare type CacheQueryOptions_3 = {
+    ignoreMethod?: boolean;
+};
+
+declare type CacheRequest = unknown;
+
+declare type CacheResponse = unknown;
+
 declare const caches_2: CacheStorage_2;
 
 declare interface CacheStorage_2 {
@@ -315,6 +336,33 @@ declare const CacheStorage_2: {
     new(): CacheStorage_2
 };
 
+/**
+ * Note about this file:
+ *
+ * Here we are providing a no-op implementation of the runtime Cache API instead of using
+ * the miniflare implementation (via `mf.getCaches()`).
+ *
+ * We are not using miniflare's implementation because that would require the user to provide
+ * miniflare-specific Request objects and they would receive back miniflare-specific Response
+ * objects, this (in particular the Request part) is not really suitable for `getBindingsProxy`
+ * as people would ideally interact with their bindings in a very production-like manner and
+ * requiring them to deal with miniflare-specific classes defeats a bit the purpose of the utility.
+ *
+ * Similarly the Request and Response types here are set to `undefined` as not to use specific ones
+ * that would require us to make a choice right now or the user to adapt their code in order to work
+ * with the api.
+ *
+ * We need to find a better/generic manner in which we can reuse the miniflare cache implementation,
+ * but until then the no-op implementation below will have to do.
+ */
+/**
+ * No-op implementation of CacheStorage
+ */
+declare class CacheStorage_3 {
+    open(cacheName: string): Promise<Cache_3>;
+    get default(): Cache_3;
+}
+
 /**
  * A Cloudflare account.
  */

package/wrangler-dist/cli.js

@@ -14580,7 +14580,7 @@ var require_cache = __commonJS({
     var { urlIsHttpHttpsScheme, createDeferredPromise, readAllBytes } = require_util2();
     var assert23 = require("assert");
     var { getGlobalDispatcher } = require_global2();
-    var Cache2 = class {
+    var Cache3 = class {
       /**
        * @see https://w3c.github.io/ServiceWorker/#dfn-relevant-request-response-list
        * @type {requestResponseList}
@@ -14593,7 +14593,7 @@ var require_cache = __commonJS({
         this.#relevantRequestResponseList = arguments[1];
       }
       async match(request3, options25 = {}) {
-        webidl.brandCheck(this, Cache2);
+        webidl.brandCheck(this, Cache3);
         webidl.argumentLengthCheck(arguments, 1, { header: "Cache.match" });
         request3 = webidl.converters.RequestInfo(request3);
         options25 = webidl.converters.CacheQueryOptions(options25);
@@ -14604,7 +14604,7 @@ var require_cache = __commonJS({
         return p2[0];
       }
       async matchAll(request3 = void 0, options25 = {}) {
-        webidl.brandCheck(this, Cache2);
+        webidl.brandCheck(this, Cache3);
         if (request3 !== void 0)
           request3 = webidl.converters.RequestInfo(request3);
         options25 = webidl.converters.CacheQueryOptions(options25);
@@ -14643,7 +14643,7 @@ var require_cache = __commonJS({
         return Object.freeze(responseList);
       }
       async add(request3) {
-        webidl.brandCheck(this, Cache2);
+        webidl.brandCheck(this, Cache3);
         webidl.argumentLengthCheck(arguments, 1, { header: "Cache.add" });
         request3 = webidl.converters.RequestInfo(request3);
         const requests = [request3];
@@ -14651,7 +14651,7 @@ var require_cache = __commonJS({
         return await responseArrayPromise;
       }
       async addAll(requests) {
-        webidl.brandCheck(this, Cache2);
+        webidl.brandCheck(this, Cache3);
         webidl.argumentLengthCheck(arguments, 1, { header: "Cache.addAll" });
         requests = webidl.converters["sequence<RequestInfo>"](requests);
         const responsePromises = [];
@@ -14749,7 +14749,7 @@ var require_cache = __commonJS({
         return cacheJobPromise.promise;
       }
       async put(request3, response) {
-        webidl.brandCheck(this, Cache2);
+        webidl.brandCheck(this, Cache3);
         webidl.argumentLengthCheck(arguments, 2, { header: "Cache.put" });
         request3 = webidl.converters.RequestInfo(request3);
         response = webidl.converters.Response(response);
@@ -14829,7 +14829,7 @@ var require_cache = __commonJS({
         return cacheJobPromise.promise;
       }
       async delete(request3, options25 = {}) {
-        webidl.brandCheck(this, Cache2);
+        webidl.brandCheck(this, Cache3);
         webidl.argumentLengthCheck(arguments, 1, { header: "Cache.delete" });
         request3 = webidl.converters.RequestInfo(request3);
         options25 = webidl.converters.CacheQueryOptions(options25);
@@ -14874,7 +14874,7 @@ var require_cache = __commonJS({
        * @returns {readonly Request[]}
        */
       async keys(request3 = void 0, options25 = {}) {
-        webidl.brandCheck(this, Cache2);
+        webidl.brandCheck(this, Cache3);
         if (request3 !== void 0)
           request3 = webidl.converters.RequestInfo(request3);
         options25 = webidl.converters.CacheQueryOptions(options25);
@@ -15050,8 +15050,8 @@ var require_cache = __commonJS({
         return true;
       }
     };
-    __name(Cache2, "Cache");
-    Object.defineProperties(Cache2.prototype, {
+    __name(Cache3, "Cache");
+    Object.defineProperties(Cache3.prototype, {
       [Symbol.toStringTag]: {
         value: "Cache",
         configurable: true
@@ -15094,7 +15094,7 @@ var require_cache = __commonJS({
       webidl.converters.RequestInfo
     );
     module3.exports = {
-      Cache: Cache2
+      Cache: Cache3
     };
   }
 });
@@ -15105,10 +15105,10 @@ var require_cachestorage = __commonJS({
     "use strict";
     init_import_meta_url();
     var { kConstruct } = require_symbols4();
-    var { Cache: Cache2 } = require_cache();
+    var { Cache: Cache3 } = require_cache();
     var { webidl } = require_webidl();
     var { kEnumerableProperty } = require_util();
-    var CacheStorage = class {
+    var CacheStorage2 = class {
       /**
        * @see https://w3c.github.io/ServiceWorker/#dfn-relevant-name-to-cache-map
        * @type {Map<string, import('./cache').requestResponseList}
@@ -15120,19 +15120,19 @@ var require_cachestorage = __commonJS({
         }
       }
       async match(request3, options25 = {}) {
-        webidl.brandCheck(this, CacheStorage);
+        webidl.brandCheck(this, CacheStorage2);
         webidl.argumentLengthCheck(arguments, 1, { header: "CacheStorage.match" });
         request3 = webidl.converters.RequestInfo(request3);
         options25 = webidl.converters.MultiCacheQueryOptions(options25);
         if (options25.cacheName != null) {
           if (this.#caches.has(options25.cacheName)) {
             const cacheList = this.#caches.get(options25.cacheName);
-            const cache2 = new Cache2(kConstruct, cacheList);
+            const cache2 = new Cache3(kConstruct, cacheList);
             return await cache2.match(request3, options25);
           }
         } else {
           for (const cacheList of this.#caches.values()) {
-            const cache2 = new Cache2(kConstruct, cacheList);
+            const cache2 = new Cache3(kConstruct, cacheList);
             const response = await cache2.match(request3, options25);
             if (response !== void 0) {
               return response;
@@ -15146,7 +15146,7 @@ var require_cachestorage = __commonJS({
        * @returns {Promise<boolean>}
        */
       async has(cacheName) {
-        webidl.brandCheck(this, CacheStorage);
+        webidl.brandCheck(this, CacheStorage2);
         webidl.argumentLengthCheck(arguments, 1, { header: "CacheStorage.has" });
         cacheName = webidl.converters.DOMString(cacheName);
         return this.#caches.has(cacheName);
@@ -15157,16 +15157,16 @@ var require_cachestorage = __commonJS({
        * @returns {Promise<Cache>}
        */
       async open(cacheName) {
-        webidl.brandCheck(this, CacheStorage);
+        webidl.brandCheck(this, CacheStorage2);
         webidl.argumentLengthCheck(arguments, 1, { header: "CacheStorage.open" });
         cacheName = webidl.converters.DOMString(cacheName);
         if (this.#caches.has(cacheName)) {
           const cache3 = this.#caches.get(cacheName);
-          return new Cache2(kConstruct, cache3);
+          return new Cache3(kConstruct, cache3);
         }
         const cache2 = [];
         this.#caches.set(cacheName, cache2);
-        return new Cache2(kConstruct, cache2);
+        return new Cache3(kConstruct, cache2);
       }
       /**
        * @see https://w3c.github.io/ServiceWorker/#cache-storage-delete
@@ -15174,7 +15174,7 @@ var require_cachestorage = __commonJS({
        * @returns {Promise<boolean>}
        */
       async delete(cacheName) {
-        webidl.brandCheck(this, CacheStorage);
+        webidl.brandCheck(this, CacheStorage2);
         webidl.argumentLengthCheck(arguments, 1, { header: "CacheStorage.delete" });
         cacheName = webidl.converters.DOMString(cacheName);
         return this.#caches.delete(cacheName);
@@ -15184,13 +15184,13 @@ var require_cachestorage = __commonJS({
        * @returns {string[]}
        */
       async keys() {
-        webidl.brandCheck(this, CacheStorage);
+        webidl.brandCheck(this, CacheStorage2);
         const keys = this.#caches.keys();
         return [...keys];
       }
     };
-    __name(CacheStorage, "CacheStorage");
-    Object.defineProperties(CacheStorage.prototype, {
+    __name(CacheStorage2, "CacheStorage");
+    Object.defineProperties(CacheStorage2.prototype, {
       [Symbol.toStringTag]: {
         value: "CacheStorage",
         configurable: true
@@ -15202,7 +15202,7 @@ var require_cachestorage = __commonJS({
       keys: kEnumerableProperty
     });
     module3.exports = {
-      CacheStorage
+      CacheStorage: CacheStorage2
     };
   }
 });
@@ -17043,9 +17043,9 @@ var require_undici = __commonJS({
       const { setGlobalOrigin, getGlobalOrigin } = require_global();
       module3.exports.setGlobalOrigin = setGlobalOrigin;
       module3.exports.getGlobalOrigin = getGlobalOrigin;
-      const { CacheStorage } = require_cachestorage();
+      const { CacheStorage: CacheStorage2 } = require_cachestorage();
       const { kConstruct } = require_symbols4();
-      module3.exports.caches = new CacheStorage(kConstruct);
+      module3.exports.caches = new CacheStorage2(kConstruct);
     }
     if (util4.nodeMajor >= 16) {
       const { deleteCookie, getCookies, getSetCookies, setCookie } = require_cookies();
@@ -94602,19 +94602,19 @@ var require_cache2 = __commonJS({
   "../../node_modules/.pnpm/ajv@6.12.6/node_modules/ajv/lib/cache.js"(exports2, module3) {
     "use strict";
     init_import_meta_url();
-    var Cache2 = module3.exports = /* @__PURE__ */ __name(function Cache3() {
+    var Cache3 = module3.exports = /* @__PURE__ */ __name(function Cache4() {
       this._cache = {};
     }, "Cache");
-    Cache2.prototype.put = /* @__PURE__ */ __name(function Cache_put(key, value) {
+    Cache3.prototype.put = /* @__PURE__ */ __name(function Cache_put(key, value) {
       this._cache[key] = value;
     }, "Cache_put");
-    Cache2.prototype.get = /* @__PURE__ */ __name(function Cache_get(key) {
+    Cache3.prototype.get = /* @__PURE__ */ __name(function Cache_get(key) {
       return this._cache[key];
     }, "Cache_get");
-    Cache2.prototype.del = /* @__PURE__ */ __name(function Cache_del(key) {
+    Cache3.prototype.del = /* @__PURE__ */ __name(function Cache_del(key) {
       delete this._cache[key];
     }, "Cache_del");
-    Cache2.prototype.clear = /* @__PURE__ */ __name(function Cache_clear() {
+    Cache3.prototype.clear = /* @__PURE__ */ __name(function Cache_clear() {
       this._cache = {};
     }, "Cache_clear");
   }
@@ -98140,7 +98140,7 @@ var require_ajv = __commonJS({
     init_import_meta_url();
     var compileSchema = require_compile();
     var resolve19 = require_resolve2();
-    var Cache2 = require_cache2();
+    var Cache3 = require_cache2();
     var SchemaObject = require_schema_obj();
     var stableStringify = require_fast_json_stable_stringify();
     var formats = require_formats2();
@@ -98181,7 +98181,7 @@ var require_ajv = __commonJS({
       this._refs = {};
       this._fragments = {};
       this._formats = formats(opts.format);
-      this._cache = opts.cache || new Cache2();
+      this._cache = opts.cache || new Cache3();
       this._loadingSchemas = {};
       this._compilations = [];
       this.RULES = rules();
@@ -104585,8 +104585,7 @@ function createMetadataObject({
   webAnalyticsToken,
   deploymentId,
   failOpen,
-  logger: logger3 = /* @__PURE__ */ __name((_message) => {
-  }, "logger")
+  logger: logger3 = noopLogger
 }) {
   return {
     ...constructRedirects({ redirects, logger: logger3 }),
@@ -104604,15 +104603,16 @@ function constructRedirects({
     return {};
   const num_valid = redirects.rules.length;
   const num_invalid = redirects.invalid.length;
-  logger3(
+  logger3.log(
     `Parsed ${num_valid} valid redirect rule${num_valid === 1 ? "" : "s"}.`
   );
   if (num_invalid > 0) {
-    logger3(`Found invalid redirect lines:`);
+    logger3.warn(`Found invalid redirect lines:`);
     for (const { line, lineNumber, message } of redirects.invalid) {
-      if (line)
-        logger3(`  - ${lineNumber ? `#${lineNumber}: ` : ""}${line}`);
-      logger3(`    ${message}`);
+      if (line) {
+        logger3.warn(`  - ${lineNumber ? `#${lineNumber}: ` : ""}${line}`);
+      }
+      logger3.warn(`    ${message}`);
     }
   }
   if (num_valid === 0) {
@@ -104631,8 +104631,8 @@ function constructRedirects({
         };
         continue;
       } else {
-        logger3(
-          `Info: the redirect rule ${rule.from} \u2192 ${rule.status} ${rule.to} could be made more performant by bringing it above any lines with splats or placeholders.`
+        logger3.info(
+          `The redirect rule ${rule.from} \u2192 ${rule.status} ${rule.to} could be made more performant by bringing it above any lines with splats or placeholders.`
         );
       }
     }
@@ -104655,13 +104655,16 @@ function constructHeaders({
     return {};
   const num_valid = headers.rules.length;
   const num_invalid = headers.invalid.length;
-  logger3(`Parsed ${num_valid} valid header rule${num_valid === 1 ? "" : "s"}.`);
+  logger3.log(
+    `Parsed ${num_valid} valid header rule${num_valid === 1 ? "" : "s"}.`
+  );
   if (num_invalid > 0) {
-    logger3(`Found invalid header lines:`);
+    logger3.warn(`Found invalid header lines:`);
     for (const { line, lineNumber, message } of headers.invalid) {
-      if (line)
-        logger3(`  - ${lineNumber ? `#${lineNumber}: ` : ""} ${line}`);
-      logger3(`    ${message}`);
+      if (line) {
+        logger3.warn(`  - ${lineNumber ? `#${lineNumber}: ` : ""} ${line}`);
+      }
+      logger3.warn(`    ${message}`);
     }
   }
   if (num_valid === 0) {
@@ -104696,10 +104699,23 @@ function constructWebAnalytics({
     }
   };
 }
+var noopLogger;
 var init_createMetadataObject = __esm({
   "../pages-shared/metadata-generator/createMetadataObject.ts"() {
     init_import_meta_url();
     init_constants();
+    noopLogger = {
+      debug: (_message) => {
+      },
+      log: (_message) => {
+      },
+      info: (_message) => {
+      },
+      warn: (_message) => {
+      },
+      error: (_error) => {
+      }
+    };
     __name(createMetadataObject, "createMetadataObject");
     __name(constructRedirects, "constructRedirects");
     __name(constructHeaders, "constructHeaders");
@@ -105888,7 +105904,7 @@ async function generateAssetsFetch(directory, log2) {
   let metadata = createMetadataObject({
     redirects,
     headers,
-    logger: log2.warn.bind(log2)
+    logger: log2
   });
   (0, import_chokidar.watch)([headersFile, redirectsFile], { persistent: true }).on(
     "change",
@@ -105910,7 +105926,7 @@ async function generateAssetsFetch(directory, log2) {
       metadata = createMetadataObject({
         redirects,
         headers,
-        logger: log2.warn
+        logger: log2
       });
     }
   );
@@ -119557,7 +119573,7 @@ var import_node_assert2 = __toESM(require("node:assert"));
 var import_undici3 = __toESM(require_undici());
 
 // package.json
-var version = "3.25.0";
+var version = "3.26.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -138397,12 +138413,12 @@ function _createClass3(Constructor, protoProps, staticProps) {
 }
 __name(_createClass3, "_createClass");
 var Cache = /* @__PURE__ */ function() {
-  function Cache2() {
-    _classCallCheck3(this, Cache2);
+  function Cache3() {
+    _classCallCheck3(this, Cache3);
     this.cache = {};
   }
-  __name(Cache2, "Cache");
-  _createClass3(Cache2, [{
+  __name(Cache3, "Cache");
+  _createClass3(Cache3, [{
     key: "get",
     value: /* @__PURE__ */ __name(function get() {
       var cache2 = this.cache;
@@ -138437,7 +138453,7 @@ var Cache = /* @__PURE__ */ function() {
       return cache2[lastKey] = value;
     }, "put")
   }]);
-  return Cache2;
+  return Cache3;
 }();
 
 // ../../node_modules/.pnpm/javascript-time-ago@2.5.7/node_modules/javascript-time-ago/modules/locale.js
@@ -143333,7 +143349,8 @@ async function deployHandler(args) {
     args.siteInclude,
     args.siteExclude
   );
-  await standardPricingWarning(accountId, config);
+  if (!args.dryRun)
+    await standardPricingWarning(accountId, config);
   await deploy({
     config,
     accountId,
@@ -147303,7 +147320,7 @@ function renderProgress(done, total) {
       /* @__PURE__ */ import_react10.default.createElement(Progress, { done, total })
     );
     return {
-      // eslint-disable-next-line no-shadow
+      // eslint-disable-next-line @typescript-eslint/no-shadow
       rerender(done2, total2) {
         rerender(/* @__PURE__ */ import_react10.default.createElement(Progress, { done: done2, total: total2 }));
       },
@@ -149442,7 +149459,7 @@ function pages(yargs) {
   ).command(
     "functions",
     false,
-    (yargs2) => yargs2.command(
+    (args) => args.command(
       "build [directory]",
       "Compile a folder of Cloudflare Pages Functions into a single Worker",
       Options6,
@@ -149456,7 +149473,7 @@ function pages(yargs) {
   ).command(
     "project",
     "\u26A1\uFE0F Interact with your Pages projects",
-    (yargs2) => yargs2.command(
+    (args) => args.command(
       "list",
       "List your Cloudflare Pages projects",
       ListOptions3,
@@ -149480,7 +149497,7 @@ function pages(yargs) {
   ).command(
     "deployment",
     "\u{1F680} Interact with the deployments of a project",
-    (yargs2) => yargs2.command(
+    (args) => args.command(
       "list",
       "List deployments in your Cloudflare Pages project",
       ListOptions4,
@@ -151550,7 +151567,7 @@ var secretBulkHandler = /* @__PURE__ */ __name(async (secretBulkArgs) => {
     }
   }
   const inheritBindings = existingBindings.filter((binding) => {
-    return binding.type !== "secret_text" || !content[binding.name];
+    return binding.type !== "secret_text" || content[binding.name] === void 0;
   }).map((binding) => ({ type: binding.type, name: binding.name }));
   const upsertBindings = Object.entries(
     content
@@ -168544,6 +168561,29 @@ init_import_meta_url();
 init_import_meta_url();
 var import_miniflare18 = require("miniflare");
 
+// src/api/integrations/bindings/caches.ts
+init_import_meta_url();
+var CacheStorage = class {
+  async open(cacheName) {
+    return new Cache2();
+  }
+  get default() {
+    return new Cache2();
+  }
+};
+__name(CacheStorage, "CacheStorage");
+var Cache2 = class {
+  async delete(request3, options25) {
+    return false;
+  }
+  async match(request3, options25) {
+    return void 0;
+  }
+  async put(request3, response) {
+  }
+};
+__name(Cache2, "Cache");
+
 // src/api/integrations/bindings/services.ts
 init_import_meta_url();
 var import_miniflare17 = require("miniflare");
@@ -168637,6 +168677,7 @@ async function getBindingsProxy(options25 = {}) {
       ...vars,
       ...bindings
     },
+    caches: new CacheStorage(),
     dispose: () => mf.dispose()
   };
 }
@@ -168662,7 +168703,10 @@ async function getMiniflareOptionsFromConfig(rawConfig, env5, options25) {
         script: "",
         modules: true,
         ...bindingOptions,
-        serviceBindings
+        serviceBindings: {
+          ...serviceBindings,
+          ...bindingOptions.serviceBindings
+        }
       },
       externalDurableObjectWorker
     ],