wrangler 0.0.0-a64aa1b94 → 0.0.0-a67cdbfc4

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": "0.0.0-a64aa1b94",
+  "version": "0.0.0-a67cdbfc4",
   "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",
@@ -62,16 +61,16 @@
     "resolve.exports": "^2.0.2",
     "selfsigned": "^2.0.1",
     "source-map": "^0.6.1",
-    "unenv": "npm:unenv-nightly@2.0.0-1724863496.70db6f1",
-    "workerd": "1.20240909.0",
+    "unenv": "npm:unenv-nightly@2.0.0-20240919-125358-9a64854",
+    "workerd": "1.20240925.0",
     "xxhash-wasm": "^1.0.1",
+    "@cloudflare/workers-shared": "0.0.0-a67cdbfc4",
     "@cloudflare/kv-asset-handler": "0.3.4",
-    "@cloudflare/workers-shared": "0.0.0-a64aa1b94",
-    "miniflare": "0.0.0-a64aa1b94"
+    "miniflare": "0.0.0-a67cdbfc4"
   },
   "devDependencies": {
     "@cloudflare/types": "^6.18.4",
-    "@cloudflare/workers-types": "^4.20240909.0",
+    "@cloudflare/workers-types": "^4.20240925.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.47.0",
@@ -154,11 +153,11 @@
     "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.58",
+    "@cloudflare/pages-shared": "^0.11.62",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20240909.0"
+    "@cloudflare/workers-types": "^4.20240925.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {

package/wrangler-dist/cli.d.ts

@@ -16,6 +16,7 @@ import { Miniflare } from 'miniflare';
 import type { MiniflareOptions } from 'miniflare';
 import type { ModuleRule } from 'miniflare';
 import { Mutex } from 'miniflare';
+import type { NodeJSCompatMode } from 'miniflare';
 import { Readable } from 'stream';
 import { ReadableStream } from 'stream/web';
 import type { Request as Request_2 } from 'miniflare';
@@ -86,6 +87,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 {
@@ -192,7 +206,7 @@ declare type BodyInit =
 | ArrayBuffer
 | AsyncIterable<Uint8Array>
 | Blob_2
-| FormData
+| FormData_2
 | Iterable<Uint8Array>
 | NodeJS.ArrayBufferView
 | URLSearchParams_2
@@ -205,7 +219,7 @@ declare interface BodyMixin {
 
     readonly arrayBuffer: () => Promise<ArrayBuffer>
     readonly blob: () => Promise<Blob_2>
-    readonly formData: () => Promise<FormData>
+    readonly formData: () => Promise<FormData_2>
     readonly json: () => Promise<unknown>
     readonly text: () => Promise<string>
 }
@@ -836,9 +850,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;
@@ -981,13 +997,13 @@ declare function deploy({ directory, accountId, projectName, branch, skipCaching
         type: string;
     };
     latest_stage: {
-        name: "build" | "deploy" | "queued" | "initialize" | "clone_repo";
+        name: "queued" | "build" | "deploy" | "initialize" | "clone_repo";
         status: "active" | "idle" | "canceled" | "success" | "failure" | "skipped";
         started_on: string | null;
         ended_on: string | null;
     };
     stages: {
-        name: "build" | "deploy" | "queued" | "initialize" | "clone_repo";
+        name: "queued" | "build" | "deploy" | "initialize" | "clone_repo";
         status: "active" | "idle" | "canceled" | "success" | "failure" | "skipped";
         started_on: string | null;
         ended_on: string | null;
@@ -1245,7 +1261,7 @@ declare namespace Dispatcher {
         path: string;
         method: HttpMethod;
         /** Default: `null` */
-        body?: string | Buffer | Uint8Array | Readable | null | FormData;
+        body?: string | Buffer | Uint8Array | Readable | null | FormData_2;
         /** Default: `null` */
         headers?: IncomingHttpHeaders | string[] | null;
         /** Query string params to be embedded in the request URL. Default: `null` */
@@ -1729,9 +1745,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 +2339,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
@@ -2413,7 +2418,7 @@ declare class FileReader {
 /**
  * Provides a way to easily construct a set of key/value pairs representing form fields and their values, which can then be easily sent using fetch().
  */
-declare class FormData {
+declare class FormData_2 {
     /**
      * Appends a new value onto an existing key inside a FormData object,
      * or adds the key if it does not already exist.
@@ -2478,7 +2483,7 @@ declare class FormData {
      * Executes given callback function for each field of the FormData instance
      */
     forEach: (
-    callbackfn: (value: FormDataEntryValue, key: string, iterable: FormData) => void,
+    callbackfn: (value: FormDataEntryValue, key: string, iterable: FormData_2) => void,
     thisArg?: unknown
     ) => void
 
@@ -2879,16 +2884,6 @@ declare interface MultiCacheQueryOptions extends CacheQueryOptions {
     cacheName?: string
 }
 
-/**
- * Wrangler can provide Node.js compatibility in a number of different modes:
- * - "legacy" - this mode adds compile-time polyfills that are not well maintained and cannot work with workerd runtime builtins.
- * - "als": this mode tells the workerd runtime to enable only the Async Local Storage builtin library (accessible via `node:async_hooks`).
- * - "v1" - this mode tells the workerd runtime to enable some Node.js builtin libraries (accessible only via `node:...` imports) but no globals.
- * - "v2" - this mode tells the workerd runtime to enable more Node.js builtin libraries (accessible both with and without the `node:` prefix)
- *   and also some Node.js globals such as `Buffer`; it also turns on additional compile-time polyfills for those that are not provided by the runtime.
- */
-declare type NodeJSCompatMode = "legacy" | "als" | "v1" | "v2" | null;
-
 declare interface Observability {
     /** If observability is enabled for this Worker */
     enabled: boolean;
@@ -25594,7 +25589,7 @@ declare class Request implements BodyMixin {
 
     readonly arrayBuffer: () => Promise<ArrayBuffer>
     readonly blob: () => Promise<Blob_2>
-    readonly formData: () => Promise<FormData>
+    readonly formData: () => Promise<FormData_2>
     readonly json: () => Promise<unknown>
     readonly text: () => Promise<string>
 
@@ -25678,7 +25673,7 @@ declare class Response implements BodyMixin {
 
     readonly arrayBuffer: () => Promise<ArrayBuffer>
     readonly blob: () => Promise<Blob_2>
-    readonly formData: () => Promise<FormData>
+    readonly formData: () => Promise<FormData_2>
     readonly json: () => Promise<unknown>
     readonly text: () => Promise<string>
 
@@ -26006,9 +26001,7 @@ declare interface StartDevWorkerInput {
         enableServiceEnvironments?: boolean;
     };
     unsafe?: Omit<CfUnsafe, "bindings">;
-    experimental?: {
-        assets?: Omit<ExperimentalAssetsOptions, "bindings">;
-    };
+    assets?: Omit<AssetsOptions, "bindings">;
 }
 
 declare type StartDevWorkerOptions = StartDevWorkerInput & {
@@ -26113,7 +26106,7 @@ declare namespace Undici {
     var Headers: Headers;
     var Response: Response;
     var Request: Request;
-    var FormData: FormData;
+    var FormData: FormData_2;
     var File: File;
     var FileReader: FileReader;
     var caches: caches;
@@ -26181,7 +26174,7 @@ declare namespace undici {
         ProgressEventInit,
         ProgressEvent,
         FormDataEntryValue,
-        FormData,
+        FormData_2 as FormData,
         DiagnosticsChannel,
         BinaryType,
         WebSocketEventMap,
@@ -26263,7 +26256,7 @@ export declare interface UnstableDevOptions {
     localProtocol?: "http" | "https";
     httpsKeyPath?: string;
     httpsCertPath?: string;
-    experimentalAssets?: string;
+    assets?: string;
     legacyAssets?: string;
     site?: string;
     siteInclude?: string[];