wrangler 0.0.0-ecdfabed0 → 0.0.0-ecef68635

package/templates/middleware/middleware-serve-static-assets.ts

@@ -14,7 +14,7 @@ import type * as kvAssetHandler from "@cloudflare/kv-asset-handler";
 
 const ASSET_MANIFEST = JSON.parse(manifest);
 
-const staticAssets: Middleware = async (request, env, _ctx, middlewareCtx) => {
+const staticAssets: Middleware = async (request, env, ctx, middlewareCtx) => {
 	let options: Partial<Options> = {
 		ASSET_MANIFEST,
 		ASSET_NAMESPACE: env.__STATIC_CONTENT,
@@ -27,7 +27,7 @@ const staticAssets: Middleware = async (request, env, _ctx, middlewareCtx) => {
 			{
 				request,
 				waitUntil(promise) {
-					return _ctx.waitUntil(promise);
+					return ctx.waitUntil(promise);
 				},
 			},
 			options

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';
@@ -30,6 +31,7 @@ import { UrlObject } from 'url';
 import { URLSearchParams as URLSearchParams_2 } from 'url';
 import type { WorkerOptions } from 'miniflare';
 import { Writable } from 'stream';
+import { z } from 'zod';
 
 declare type AbortSignal_2 = unknown;
 
@@ -72,6 +74,32 @@ declare type ApiCredentials = {
     authEmail: string;
 };
 
+declare type AssetConfig = z.infer<typeof AssetConfigSchema>;
+
+declare const AssetConfigSchema: z.ZodObject<{
+    html_handling: z.ZodOptional<z.ZodEnum<["auto-trailing-slash", "force-trailing-slash", "drop-trailing-slash", "none"]>>;
+    not_found_handling: z.ZodOptional<z.ZodEnum<["single-page-application", "404-page", "none"]>>;
+}, "strip", z.ZodTypeAny, {
+    html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";
+    not_found_handling?: "none" | "single-page-application" | "404-page";
+}, {
+    html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";
+    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 {
@@ -148,6 +176,8 @@ declare type Binding = {
 } & Omit<CfDispatchNamespace, "binding">) | ({
     type: "mtls_certificate";
 } & Omit<CfMTlsCertificate, "binding">) | ({
+    type: "pipeline";
+} & Omit<CfPipeline, "binding">) | ({
     type: "logfwdr";
 } & Omit<CfLogfwdrBinding, "name">) | {
     type: `unsafe_${string}`;
@@ -176,7 +206,7 @@ declare type BodyInit =
 | ArrayBuffer
 | AsyncIterable<Uint8Array>
 | Blob_2
-| FormData
+| FormData_2
 | Iterable<Uint8Array>
 | NodeJS.ArrayBufferView
 | URLSearchParams_2
@@ -189,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>
 }
@@ -519,6 +549,11 @@ declare interface CfMTlsCertificate {
     certificate_id: string;
 }
 
+declare interface CfPipeline {
+    binding: string;
+    pipeline: string;
+}
+
 declare interface CfQueue {
     binding: string;
     queue_name: string;
@@ -742,7 +777,7 @@ declare class ConfigController extends Controller<ConfigControllerEventMap> {
     #private;
     latestInput?: StartDevWorkerInput;
     latestConfig?: StartDevWorkerOptions;
-    set(input: StartDevWorkerInput): Promise<StartDevWorkerOptions | undefined>;
+    set(input: StartDevWorkerInput, throwErrors?: boolean): Promise<StartDevWorkerOptions | undefined>;
     patch(input: Partial<StartDevWorkerInput>): Promise<StartDevWorkerOptions | undefined>;
     teardown(): Promise<void>;
     emitConfigUpdateEvent(config: StartDevWorkerOptions): void;
@@ -815,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;
@@ -960,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;
@@ -975,7 +1012,6 @@ 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: {
@@ -990,6 +1026,7 @@ 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;
@@ -1224,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` */
@@ -1390,6 +1427,25 @@ declare type DurableObjectBindings = {
     environment?: string;
 }[];
 
+/**
+ * Configuration in wrangler for Durable Object Migrations
+ */
+declare type DurableObjectMigration = {
+    /** A unique identifier for this migration. */
+    tag: string;
+    /** The new Durable Objects being defined. */
+    new_classes?: string[];
+    /** The new SQLite Durable Objects being defined. */
+    new_sqlite_classes?: string[];
+    /** The Durable Objects being renamed. */
+    renamed_classes?: {
+        from: string;
+        to: string;
+    }[];
+    /** The Durable Objects being removed. */
+    deleted_classes?: string[];
+};
+
 declare interface EnablePagesAssetsServiceBindingOptions {
     proxyPort?: number;
     directory?: string;
@@ -1554,21 +1610,7 @@ declare interface EnvironmentInheritable {
      * @default []
      * @inheritable
      */
-    migrations: {
-        /** A unique identifier for this migration. */
-        tag: string;
-        /** The new Durable Objects being defined. */
-        new_classes?: string[];
-        /** The new SQLite Durable Objects being defined. */
-        new_sqlite_classes?: string[];
-        /** The Durable Objects being renamed. */
-        renamed_classes?: {
-            from: string;
-            to: string;
-        }[];
-        /** The Durable Objects being removed. */
-        deleted_classes?: string[];
-    }[];
+    migrations: DurableObjectMigration[];
     /**
      * "Cron" definitions to trigger a Worker's "scheduled" function.
      *
@@ -1698,13 +1740,22 @@ declare interface EnvironmentInheritable {
      */
     placement: {
         mode: "off" | "smart";
+        hint?: string;
     } | undefined;
     /**
      * Specify the directory of static assets to deploy/serve
      *
+     * More details at https://developers.cloudflare.com/workers/frameworks/
+     *
+     * @inheritable
+     */
+    assets: Assets | undefined;
+    /**
+     * Specify the observability behavior of the Worker.
+     *
      * @inheritable
      */
-    experimental_assets: ExperimentalAssets | undefined;
+    observability: Observability | undefined;
 }
 
 /**
@@ -2062,6 +2113,21 @@ declare interface EnvironmentNonInheritable {
         /** Details about the outbound Worker which will handle outbound requests from your namespace */
         outbound?: DispatchNamespaceOutbound;
     }[];
+    /**
+     * Specifies list of Pipelines bound to this Worker environment
+     *
+     * NOTE: This field is not automatically inherited from the top level environment,
+     * and so must be specified in every named environment.
+     *
+     * @default `[]`
+     * @nonInheritable
+     */
+    pipelines: {
+        /** The binding name used to refer to the bound service. */
+        binding: string;
+        /** Name of the Pipeline to bind */
+        pipeline: string;
+    }[];
 }
 
 declare type ErrorEvent = BaseErrorEvent<"ConfigController" | "BundlerController" | "LocalRuntimeController" | "RemoteRuntimeController" | "ProxyWorker" | "InspectorProxyWorker"> | BaseErrorEvent<"ProxyController", {
@@ -2273,16 +2339,6 @@ declare class ExecutionContext {
     passThroughOnException(): void;
 }
 
-declare type ExperimentalAssets = {
-    /** Absolute path to assets directory */
-    directory: string;
-    binding?: string;
-};
-
-declare interface ExperimentalAssetsOptions extends ExperimentalAssets {
-    routingConfig: RoutingConfig;
-}
-
 declare function fetch (
 input: RequestInfo,
 init?: RequestInit
@@ -2362,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.
@@ -2427,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
 
@@ -2602,7 +2658,9 @@ declare interface Interceptable extends Dispatcher {
 declare class Logger {
     #private;
     constructor();
-    loggerLevel: "error" | "none" | "warn" | "info" | "log" | "debug";
+    private overrideLoggerLevel?;
+    get loggerLevel(): "error" | "none" | "warn" | "info" | "log" | "debug";
+    set loggerLevel(val: "error" | "none" | "warn" | "info" | "log" | "debug");
     columns: number;
     debug: (...args: unknown[]) => void;
     debugWithSanitization: (label: string, ...args: unknown[]) => void;
@@ -2828,15 +2886,12 @@ 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;
+    /** The sampling rate */
+    head_sampling_rate?: number;
+}
 
 declare interface PagesConfigFields {
     /**
@@ -25536,7 +25591,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>
 
@@ -25620,7 +25675,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>
 
@@ -25762,9 +25817,15 @@ declare namespace RetryHandler {
 
 declare type Route = SimpleRoute | ZoneIdRoute | ZoneNameRoute | CustomDomainRoute;
 
-declare type RoutingConfig = {
-    hasUserWorker: boolean;
-};
+declare type RoutingConfig = z.infer<typeof RoutingConfigSchema>;
+
+declare const RoutingConfigSchema: z.ZodObject<{
+    has_user_worker: z.ZodOptional<z.ZodBoolean>;
+}, "strip", z.ZodTypeAny, {
+    has_user_worker?: boolean;
+}, {
+    has_user_worker?: boolean;
+}>;
 
 /**
  * A bundling resolver rule, defining the modules type for paths that match the specified globs.
@@ -25855,6 +25916,7 @@ declare interface StartDevWorkerInput {
     env?: string;
     /** The bindings available to the worker. The specified bindind type will be exposed to the worker on the `env` object under the same key. */
     bindings?: Record<string, Binding>;
+    migrations?: DurableObjectMigration[];
     /** The triggers which will cause the worker's exported default handlers to be called. */
     triggers?: Trigger[];
     /**
@@ -25941,12 +26003,10 @@ declare interface StartDevWorkerInput {
         enableServiceEnvironments?: boolean;
     };
     unsafe?: Omit<CfUnsafe, "bindings">;
-    experimental?: {
-        assets?: Omit<ExperimentalAssetsOptions, "bindings">;
-    };
+    assets?: string;
 }
 
-declare type StartDevWorkerOptions = StartDevWorkerInput & {
+declare type StartDevWorkerOptions = Omit<StartDevWorkerInput, "assets"> & {
     /** A worker's directory. Usually where the wrangler.toml file is located */
     directory: string;
     build: StartDevWorkerInput["build"] & {
@@ -25966,6 +26026,7 @@ declare type StartDevWorkerOptions = StartDevWorkerInput & {
         persist: string;
     };
     entrypoint: string;
+    assets?: AssetsOptions;
 };
 
 /** A faster version of `request`. */
@@ -26048,7 +26109,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;
@@ -26116,7 +26177,7 @@ declare namespace undici {
         ProgressEventInit,
         ProgressEvent,
         FormDataEntryValue,
-        FormData,
+        FormData_2 as FormData,
         DiagnosticsChannel,
         BinaryType,
         WebSocketEventMap,
@@ -26198,7 +26259,7 @@ export declare interface UnstableDevOptions {
     localProtocol?: "http" | "https";
     httpsKeyPath?: string;
     httpsCertPath?: string;
-    experimentalAssets?: string;
+    assets?: string;
     legacyAssets?: string;
     site?: string;
     siteInclude?: string[];