wrangler 3.57.2 → 3.58.0

package/config-schema.json

@@ -1003,38 +1003,45 @@
           "type": "array"
         },
         "assets": {
-          "additionalProperties": false,
-          "description": "Serve a folder of static assets with your Worker, without any additional code. This can either be a string, or an object with additional config fields.",
-          "properties": {
-            "browser_TTL": {
-              "type": "number"
-            },
-            "bucket": {
-              "type": "string"
-            },
-            "exclude": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            },
-            "include": {
-              "items": {
-                "type": "string"
+          "anyOf": [
+            {
+              "additionalProperties": false,
+              "properties": {
+                "browser_TTL": {
+                  "type": "number"
+                },
+                "bucket": {
+                  "type": "string"
+                },
+                "exclude": {
+                  "items": {
+                    "type": "string"
+                  },
+                  "type": "array"
+                },
+                "include": {
+                  "items": {
+                    "type": "string"
+                  },
+                  "type": "array"
+                },
+                "serve_single_page_app": {
+                  "type": "boolean"
+                }
               },
-              "type": "array"
+              "required": [
+                "bucket",
+                "include",
+                "exclude",
+                "serve_single_page_app"
+              ],
+              "type": "object"
             },
-            "serve_single_page_app": {
-              "type": "boolean"
+            {
+              "type": "string"
             }
-          },
-          "required": [
-            "bucket",
-            "include",
-            "exclude",
-            "serve_single_page_app"
           ],
-          "type": "object"
+          "description": "Serve a folder of static assets with your Worker, without any additional code. This can either be a string, or an object with additional config fields."
         },
         "base_dir": {
           "description": "The directory in which module rules should be evaluated when including additional files into a Worker deployment. This defaults to the directory containing the `main` entry point of the Worker if not specified.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.57.2",
+  "version": "3.58.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -63,7 +63,7 @@
     "source-map": "0.6.1",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.2",
-    "miniflare": "3.20240524.0"
+    "miniflare": "3.20240524.1"
   },
   "devDependencies": {
     "@cloudflare/types": "^6.18.4",
@@ -148,10 +148,10 @@
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
-    "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "@cloudflare/pages-shared": "^0.11.39"
+    "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/pages-shared": "^0.11.40",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"

package/wrangler-dist/cli.d.ts

@@ -658,7 +658,7 @@ declare interface ConfigFields<Dev extends RawDevConfig> {
         exclude: string[];
         browser_TTL: number | undefined;
         serve_single_page_app: boolean;
-    } | undefined;
+    } | string | undefined;
     /**
      * A list of wasm modules that your worker should be bound to. This is
      * the "legacy" way of binding to a wasm module. ES module workers should

package/wrangler-dist/cli.js

@@ -152654,7 +152654,7 @@ init_import_meta_url();
 init_import_meta_url();
 
 // package.json
-var version = "3.57.2";
+var version = "3.58.0";
 var package_default = {
   name: "wrangler",
   version,
@@ -154591,7 +154591,7 @@ function getAuthFromEnv() {
   }
 }
 __name(getAuthFromEnv, "getAuthFromEnv");
-var USER_AUTH_CONFIG_FILE = "config/default.toml";
+var USER_AUTH_CONFIG_PATH = "config";
 var DefaultScopes = {
   "account:read": "See your account info such as account details, analytics, and memberships.",
   "user:read": "See your user info such as name, email address, and account memberships.",
@@ -154990,28 +154990,25 @@ async function generatePKCECodes() {
   return { codeChallenge, codeVerifier };
 }
 __name(generatePKCECodes, "generatePKCECodes");
+function getAuthConfigFilePath() {
+  const environment = getCloudflareApiEnvironmentFromEnv();
+  const filePath = `${USER_AUTH_CONFIG_PATH}/${environment === "production" ? "default.toml" : `${environment}.toml`}`;
+  return import_node_path6.default.join(getGlobalWranglerConfigPath(), filePath);
+}
+__name(getAuthConfigFilePath, "getAuthConfigFilePath");
 function writeAuthConfigFile(config) {
-  const authConfigFilePath = import_node_path6.default.join(
-    getGlobalWranglerConfigPath(),
-    USER_AUTH_CONFIG_FILE
-  );
-  (0, import_node_fs3.mkdirSync)(import_node_path6.default.dirname(authConfigFilePath), {
+  const configPath = getAuthConfigFilePath();
+  (0, import_node_fs3.mkdirSync)(import_node_path6.default.dirname(configPath), {
     recursive: true
   });
-  (0, import_node_fs3.writeFileSync)(
-    import_node_path6.default.join(authConfigFilePath),
-    import_toml2.default.stringify(config),
-    { encoding: "utf-8" }
-  );
+  (0, import_node_fs3.writeFileSync)(import_node_path6.default.join(configPath), import_toml2.default.stringify(config), {
+    encoding: "utf-8"
+  });
   reinitialiseAuthTokens();
 }
 __name(writeAuthConfigFile, "writeAuthConfigFile");
 function readAuthConfigFile() {
-  const authConfigFilePath = import_node_path6.default.join(
-    getGlobalWranglerConfigPath(),
-    USER_AUTH_CONFIG_FILE
-  );
-  const toml = parseTOML(readFileSync5(authConfigFilePath));
+  const toml = parseTOML(readFileSync5(getAuthConfigFilePath()));
   return toml;
 }
 __name(readAuthConfigFile, "readAuthConfigFile");
@@ -155176,7 +155173,7 @@ async function logout() {
     }
   });
   await response.text();
-  (0, import_node_fs3.rmSync)(import_node_path6.default.join(getGlobalWranglerConfigPath(), USER_AUTH_CONFIG_FILE));
+  (0, import_node_fs3.rmSync)(getAuthConfigFilePath());
   logger.log(`Successfully logged out.`);
 }
 __name(logout, "logout");
@@ -198482,7 +198479,7 @@ async function generateTypes(configToDTS, config, envInterface, outputPath) {
     );
   }
   if (configToDTS.ai) {
-    envTypeStructure.push(constructType(configToDTS.ai.binding, "unknown"));
+    envTypeStructure.push(constructType(configToDTS.ai.binding, "Ai"));
   }
   if (configToDTS.version_metadata) {
     envTypeStructure.push(
@@ -207395,7 +207392,8 @@ function unstable_getMiniflareWorkerOptions(configPath, environment) {
   if (bindings.services !== void 0) {
     bindingOptions.serviceBindings = Object.fromEntries(
       bindings.services.map((binding) => {
-        return [binding.binding, binding.service];
+        const name = binding.service === config.name ? import_miniflare18.kCurrentWorker : binding.service;
+        return [binding.binding, { name, entrypoint: binding.entrypoint }];
       })
     );
   }
@@ -208077,3 +208075,4 @@ yargs-parser/build/lib/index.js:
    * SPDX-License-Identifier: ISC
    *)
 */
+//# sourceMappingURL=cli.js.map