wrangler 3.78.8 → 3.78.9

package/config-schema.json

@@ -2,6 +2,39 @@
   "$ref": "#/definitions/RawConfig",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
+    "Assets": {
+      "additionalProperties": false,
+      "properties": {
+        "binding": {
+          "type": "string"
+        },
+        "directory": {
+          "description": "Absolute path to assets directory",
+          "type": "string"
+        },
+        "html_handling": {
+          "enum": [
+            "auto-trailing-slash",
+            "force-trailing-slash",
+            "drop-trailing-slash",
+            "none"
+          ],
+          "type": "string"
+        },
+        "not_found_handling": {
+          "enum": [
+            "single-page-application",
+            "404-page",
+            "none"
+          ],
+          "type": "string"
+        }
+      },
+      "required": [
+        "directory"
+      ],
+      "type": "object"
+    },
     "CloudchamberConfig": {
       "additionalProperties": false,
       "description": "Configuration in wrangler for Cloudchamber",
@@ -239,6 +272,10 @@
           },
           "type": "array"
         },
+        "assets": {
+          "$ref": "#/definitions/Assets",
+          "description": "Specify the directory of static assets to deploy/serve\n\nMore details at https://developers.cloudflare.com/workers/frameworks/"
+        },
         "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.",
           "type": "string"
@@ -404,10 +441,6 @@
           ],
           "type": "object"
         },
-        "experimental_assets": {
-          "$ref": "#/definitions/ExperimentalAssets",
-          "description": "Specify the directory of static assets to deploy/serve"
-        },
         "find_additional_modules": {
           "description": "If true then Wrangler will traverse the file tree below `base_dir`; Any files that match `rules` will be included in the deployed Worker. Defaults to true if `no_bundle` is true, otherwise false.",
           "type": "boolean"
@@ -1016,39 +1049,6 @@
       ],
       "type": "object"
     },
-    "ExperimentalAssets": {
-      "additionalProperties": false,
-      "properties": {
-        "binding": {
-          "type": "string"
-        },
-        "directory": {
-          "description": "Absolute path to assets directory",
-          "type": "string"
-        },
-        "html_handling": {
-          "enum": [
-            "auto-trailing-slash",
-            "force-trailing-slash",
-            "drop-trailing-slash",
-            "none"
-          ],
-          "type": "string"
-        },
-        "not_found_handling": {
-          "enum": [
-            "single-page-application",
-            "404-page",
-            "none"
-          ],
-          "type": "string"
-        }
-      },
-      "required": [
-        "directory"
-      ],
-      "type": "object"
-    },
     "Json": {
       "anyOf": [
         {
@@ -1145,45 +1145,8 @@
           "type": "array"
         },
         "assets": {
-          "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"
-                }
-              },
-              "required": [
-                "bucket",
-                "include",
-                "exclude",
-                "serve_single_page_app"
-              ],
-              "type": "object"
-            },
-            {
-              "type": "string"
-            }
-          ],
-          "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. Only one of assets and legacy_assets can be used."
+          "$ref": "#/definitions/Assets",
+          "description": "Specify the directory of static assets to deploy/serve\n\nMore details at https://developers.cloudflare.com/workers/frameworks/"
         },
         "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.",
@@ -1372,10 +1335,6 @@
           "description": "The `env` section defines overrides for the configuration for different environments.\n\nAll environment fields can be specified at the top level of the config indicating the default environment settings.\n\n- Some fields are inherited and overridable in each environment.\n- But some are not inherited and must be explicitly specified in every environment, if they are specified at the top level.\n\nFor more information, see the documentation at https://developers.cloudflare.com/workers/cli-wrangler/configuration#environments",
           "type": "object"
         },
-        "experimental_assets": {
-          "$ref": "#/definitions/ExperimentalAssets",
-          "description": "Specify the directory of static assets to deploy/serve"
-        },
         "experimental_services": {
           "default": "`[]`",
           "deprecated": "DO NOT USE. We'd added this to test the new service binding system, but the proper way to test experimental features is to use `unsafe.bindings` configuration.",
@@ -1526,7 +1485,7 @@
               "type": "string"
             }
           ],
-          "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. Only one of assets and legacy_assets can be used."
+          "description": "Old behaviour of serving 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. Will be deprecated in the near future in favor of `assets`."
         },
         "legacy_env": {
           "description": "A boolean to enable \"legacy\" style wrangler environments (from Wrangler v1). These have been superseded by Services, but there may be projects that won't (or can't) use them. If you're using a legacy environment, you can set this to `true` to enable it.",
@@ -2208,6 +2167,10 @@
           },
           "type": "array"
         },
+        "assets": {
+          "$ref": "#/definitions/Assets",
+          "description": "Specify the directory of static assets to deploy/serve\n\nMore details at https://developers.cloudflare.com/workers/frameworks/"
+        },
         "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.",
           "type": "string"
@@ -2373,10 +2336,6 @@
           ],
           "type": "object"
         },
-        "experimental_assets": {
-          "$ref": "#/definitions/ExperimentalAssets",
-          "description": "Specify the directory of static assets to deploy/serve"
-        },
         "experimental_services": {
           "default": "`[]`",
           "deprecated": "DO NOT USE. We'd added this to test the new service binding system, but the proper way to test experimental features is to use `unsafe.bindings` configuration.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.78.8",
+  "version": "3.78.9",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -54,7 +54,6 @@
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "blake3-wasm": "^2.1.5",
     "chokidar": "^3.5.3",
-    "date-fns": "^3.6.0",
     "esbuild": "0.17.19",
     "nanoid": "^3.3.3",
     "path-to-regexp": "^6.3.0",
@@ -152,9 +151,9 @@
     "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/pages-shared": "^0.11.61",
-    "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {

package/wrangler-dist/cli.d.ts

@@ -86,6 +86,19 @@ declare const AssetConfigSchema: z.ZodObject<{
     not_found_handling?: "none" | "single-page-application" | "404-page";
 }>;
 
+declare type Assets = {
+    /** Absolute path to assets directory */
+    directory: string;
+    binding?: string;
+    html_handling?: "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash" | "none";
+    not_found_handling?: "single-page-application" | "404-page" | "none";
+};
+
+declare type AssetsOptions = Pick<Assets, "directory" | "binding"> & {
+    routingConfig: RoutingConfig;
+    assetConfig: AssetConfig;
+};
+
 declare type AsyncHook<T extends HookValues, Args extends unknown[] = []> = Hook<T, Args> | Hook<Promise<T>, Args>;
 
 declare class BalancedPool extends Dispatcher {
@@ -836,9 +849,11 @@ declare interface ConfigFields<Dev extends RawDevConfig> {
         exclude?: string[];
     } | undefined;
     /**
-     * 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.
-     * Only one of assets and legacy_assets can be used.
+     * Old behaviour of serving 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.
+     * Will be deprecated in the near future in favor of `assets`.
      */
     legacy_assets: {
         bucket: string;
@@ -1729,9 +1744,11 @@ declare interface EnvironmentInheritable {
     /**
      * Specify the directory of static assets to deploy/serve
      *
+     * More details at https://developers.cloudflare.com/workers/frameworks/
+     *
      * @inheritable
      */
-    experimental_assets: ExperimentalAssets | undefined;
+    assets: Assets | undefined;
     /**
      * Specify the observability behavior of the Worker.
      *
@@ -2321,19 +2338,6 @@ declare class ExecutionContext {
     passThroughOnException(): void;
 }
 
-declare type ExperimentalAssets = {
-    /** Absolute path to assets directory */
-    directory: string;
-    binding?: string;
-    html_handling?: "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash" | "none";
-    not_found_handling?: "single-page-application" | "404-page" | "none";
-};
-
-declare type ExperimentalAssetsOptions = Pick<ExperimentalAssets, "directory" | "binding"> & {
-    routingConfig: RoutingConfig;
-    assetConfig: AssetConfig;
-};
-
 declare function fetch (
 input: RequestInfo,
 init?: RequestInit
@@ -26006,9 +26010,7 @@ declare interface StartDevWorkerInput {
         enableServiceEnvironments?: boolean;
     };
     unsafe?: Omit<CfUnsafe, "bindings">;
-    experimental?: {
-        assets?: Omit<ExperimentalAssetsOptions, "bindings">;
-    };
+    assets?: Omit<AssetsOptions, "bindings">;
 }
 
 declare type StartDevWorkerOptions = StartDevWorkerInput & {
@@ -26263,7 +26265,7 @@ export declare interface UnstableDevOptions {
     localProtocol?: "http" | "https";
     httpsKeyPath?: string;
     httpsCertPath?: string;
-    experimentalAssets?: string;
+    assets?: string;
     legacyAssets?: string;
     site?: string;
     siteInclude?: string[];