wrangler 0.0.0-eec0a6459 → 0.0.0-eec2a7074

package/templates/middleware/middleware-mock-analytics-engine.ts

@@ -0,0 +1,30 @@
+/// <reference path="middleware-mock-analytics-engine.d.ts"/>
+
+import { bindings } from "config:middleware/mock-analytics-engine";
+import type { Middleware } from "./common";
+
+const bindingsEnv = Object.fromEntries(
+	bindings.map((binding) => [
+		binding,
+		{
+			writeDataPoint() {
+				// no op in dev
+			},
+		},
+	])
+) satisfies Record<string, AnalyticsEngineDataset>;
+
+const analyticsEngine: Middleware = async (
+	request,
+	env,
+	_ctx,
+	middlewareCtx
+) => {
+	// we're going to directly modify env so it maintains referential equality
+	for (const binding of bindings) {
+		env[binding] ??= bindingsEnv[binding];
+	}
+	return await middlewareCtx.next(request, env);
+};
+
+export default analyticsEngine;

package/templates/middleware/middleware-scheduled.ts

@@ -9,7 +9,21 @@ const scheduled: Middleware = async (request, env, _ctx, middlewareCtx) => {
 
 		return new Response("Ran scheduled event");
 	}
-	return middlewareCtx.next(request, env);
+
+	const resp = await middlewareCtx.next(request, env);
+
+	// If you open the `/__scheduled` page in a browser, the browser will automatically make a request to `/favicon.ico`.
+	// For scheduled Workers _without_ a fetch handler, this will result in a 500 response that clutters the log with unhelpful error messages.
+	// To avoid this, inject a 404 response to favicon.ico loads on the `/__scheduled` page
+	if (
+		request.headers.get("referer")?.endsWith("/__scheduled") &&
+		url.pathname === "/favicon.ico" &&
+		resp.status === 500
+	) {
+		return new Response(null, { status: 404 });
+	}
+
+	return resp;
 };
 
 export default scheduled;

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 {
@@ -109,7 +137,7 @@ declare type Binding = {
     type: "kv_namespace";
 } & BindingOmit<CfKvNamespace>) | ({
     type: "send_email";
-} & BindingOmit<CfSendEmailBindings>) | {
+} & NameOmit<CfSendEmailBindings>) | {
     type: "wasm_module";
     source: BinaryFile;
 } | {
@@ -126,7 +154,7 @@ declare type Binding = {
     source: BinaryFile;
 } | ({
     type: "durable_object_namespace";
-} & BindingOmit<CfDurableObject>) | ({
+} & NameOmit<CfDurableObject>) | ({
     type: "workflow";
 } & BindingOmit<CfWorkflow>) | ({
     type: "queue";
@@ -150,14 +178,16 @@ declare type Binding = {
 } & Omit<CfDispatchNamespace, "binding">) | ({
     type: "mtls_certificate";
 } & Omit<CfMTlsCertificate, "binding">) | ({
+    type: "pipeline";
+} & Omit<CfPipeline, "binding">) | ({
     type: "logfwdr";
-} & Omit<CfLogfwdrBinding, "name">) | {
+} & NameOmit<CfLogfwdrBinding>) | {
     type: `unsafe_${string}`;
 } | {
     type: "assets";
 };
 
-declare type BindingOmit<T> = Omit<T, "binding" | "name">;
+declare type BindingOmit<T> = Omit<T, "binding">;
 
 /**
  * Result of the `getBindingsProxy` utility
@@ -178,7 +208,7 @@ declare type BodyInit =
 | ArrayBuffer
 | AsyncIterable<Uint8Array>
 | Blob_2
-| FormData
+| FormData_2
 | Iterable<Uint8Array>
 | NodeJS.ArrayBufferView
 | URLSearchParams_2
@@ -191,7 +221,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>
 }
@@ -521,6 +551,11 @@ declare interface CfMTlsCertificate {
     certificate_id: string;
 }
 
+declare interface CfPipeline {
+    binding: string;
+    pipeline: string;
+}
+
 declare interface CfQueue {
     binding: string;
     queue_name: string;
@@ -603,7 +638,6 @@ declare interface CfWorkflow {
     class_name: string;
     binding: string;
     script_name?: string;
-    environment?: string;
 }
 
 /**
@@ -752,7 +786,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;
@@ -825,9 +859,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;
@@ -970,14 +1006,14 @@ declare function deploy({ directory, accountId, projectName, branch, skipCaching
         type: string;
     };
     latest_stage: {
-        name: "build" | "deploy" | "queued" | "initialize" | "clone_repo";
-        status: "active" | "idle" | "canceled" | "success" | "failure" | "skipped";
+        name: "queued" | "build" | "deploy" | "initialize" | "clone_repo";
+        status: "active" | "idle" | "success" | "canceled" | "failure" | "skipped";
         started_on: string | null;
         ended_on: string | null;
     };
     stages: {
-        name: "build" | "deploy" | "queued" | "initialize" | "clone_repo";
-        status: "active" | "idle" | "canceled" | "success" | "failure" | "skipped";
+        name: "queued" | "build" | "deploy" | "initialize" | "clone_repo";
+        status: "active" | "idle" | "success" | "canceled" | "failure" | "skipped";
         started_on: string | null;
         ended_on: string | null;
     }[];
@@ -1234,7 +1270,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` */
@@ -1400,6 +1436,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;
@@ -1419,12 +1474,12 @@ declare type Entry = {
     format: CfScriptFormat;
     /** The directory that contains all of a `--no-bundle` worker's modules. Usually `${directory}/src`. Defaults to path.dirname(file) */
     moduleRoot: string;
-    /** Whether this is a no-op worker that will not ultimately be uploaded e.g. for assets*/
-    staticAssetsOnly?: boolean;
     /**
      * A worker's name
      */
     name?: string | undefined;
+    /** Export from a Worker's entrypoint */
+    exports: string[];
 };
 
 /**
@@ -1511,6 +1566,7 @@ declare interface EnvironmentInheritable {
      * test and deploy your Worker.
      *
      * // Carmen according to our tests the default is undefined
+     * // warning: you must force "workers_dev: true" in tests to match expected behavior
      * @default `true` (This is a breaking change from Wrangler v1)
      * @breaking
      * @inheritable
@@ -1565,19 +1621,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 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.
      *
@@ -1707,13 +1751,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
      */
-    experimental_assets: ExperimentalAssets | undefined;
+    assets: Assets | undefined;
+    /**
+     * Specify the observability behavior of the Worker.
+     *
+     * @inheritable
+     */
+    observability: Observability | undefined;
 }
 
 /**
@@ -2081,6 +2134,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", {
@@ -2292,12 +2360,6 @@ declare class ExecutionContext {
     passThroughOnException(): void;
 }
 
-declare type ExperimentalAssets = {
-    /** Absolute path to assets directory */
-    directory: string;
-    binding?: string;
-};
-
 declare function fetch (
 input: RequestInfo,
 init?: RequestInit
@@ -2377,7 +2439,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.
@@ -2442,7 +2504,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
 
@@ -2617,7 +2679,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;
@@ -2627,6 +2691,8 @@ declare class Logger {
     error: (...args: unknown[]) => void;
     table<Keys extends string>(data: TableRow<Keys>[]): void;
     console<M extends Exclude<keyof Console, "Console">>(method: M, ...args: Parameters<Console[M]>): void;
+    static warnOnceHistory: Set<unknown>;
+    warnOnce(message: string): void;
     private doLog;
     static registerBeforeLogHook(callback: (() => void) | undefined): void;
     static registerAfterLogHook(callback: (() => void) | undefined): void;
@@ -2843,14 +2909,14 @@ 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.
- * - "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" | "v1" | "v2" | null;
+declare type NameOmit<T> = Omit<T, "name">;
+
+declare interface Observability {
+    /** If observability is enabled for this Worker */
+    enabled: boolean;
+    /** The sampling rate */
+    head_sampling_rate?: number;
+}
 
 declare interface PagesConfigFields {
     /**
@@ -25550,7 +25616,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>
 
@@ -25634,7 +25700,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>
 
@@ -25776,6 +25842,16 @@ declare namespace RetryHandler {
 
 declare type Route = SimpleRoute | ZoneIdRoute | ZoneNameRoute | CustomDomainRoute;
 
+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.
  */
@@ -25865,6 +25941,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[];
     /**
@@ -25915,7 +25992,7 @@ declare interface StartDevWorkerInput {
         /** Whether the worker runs on the edge or locally. */
         remote?: boolean;
         /** Cloudflare Account credentials. Can be provided upfront or as a function which will be called only when required. */
-        auth?: AsyncHook<CfAccount>;
+        auth?: AsyncHook<CfAccount, [Pick<Config, "account_id">]>;
         /** Whether local storage (KV, Durable Objects, R2, D1, etc) is persisted. You can also specify the directory to persist data to. */
         persist?: string;
         /** Controls which logs are logged 🤙. */
@@ -25944,6 +26021,8 @@ declare interface StartDevWorkerInput {
         /** Describes the registry of other Workers running locally */
         registry?: WorkerRegistry;
         testScheduled?: boolean;
+        /** Whether to use Vectorize mixed mode -- the worker is run locally but accesses to Vectorize are made remotely */
+        bindVectorizeToProd?: boolean;
     };
     legacy?: {
         site?: Hook<Config["site"], [Config]>;
@@ -25951,12 +26030,10 @@ declare interface StartDevWorkerInput {
         enableServiceEnvironments?: boolean;
     };
     unsafe?: Omit<CfUnsafe, "bindings">;
-    experimental?: {
-        assets?: Omit<ExperimentalAssets, "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 +26043,7 @@ declare type StartDevWorkerOptions = StartDevWorkerInput & {
         moduleRules: Rule[];
         define: Record<string, string>;
         additionalModules: CfModule[];
+        exports: string[];
         processEntrypoint: boolean;
     };
     legacy: StartDevWorkerInput["legacy"] & {
@@ -25974,10 +26052,17 @@ declare type StartDevWorkerOptions = StartDevWorkerInput & {
     };
     dev: StartDevWorkerInput["dev"] & {
         persist: string;
+        auth?: AsyncHook<CfAccount>;
     };
     entrypoint: string;
+    assets?: AssetsOptions;
 };
 
+declare function startWorkerRegistryServer(port: number): Promise<{
+    server: Server<IncomingMessage, ServerResponse>;
+    terminator: HttpTerminator;
+}>;
+
 /** A faster version of `request`. */
 declare function stream(
 url: string | URL_2 | UrlObject,
@@ -26058,7 +26143,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;
@@ -26126,7 +26211,7 @@ declare namespace undici {
         ProgressEventInit,
         ProgressEvent,
         FormDataEntryValue,
-        FormData,
+        FormData_2 as FormData,
         DiagnosticsChannel,
         BinaryType,
         WebSocketEventMap,
@@ -26187,10 +26272,7 @@ export declare function unstable_splitSqlQuery(sql: string): string[];
 
 export declare function unstable_startWorker(options: StartDevWorkerInput): Promise<Worker>;
 
-export declare function unstable_startWorkerRegistryServer(port: number): Promise<{
-    server: Server<IncomingMessage, ServerResponse>;
-    terminator: HttpTerminator;
-}>;
+export declare const unstable_startWorkerRegistryServer: startWorkerRegistryServer;
 
 export declare interface UnstableASSETSBindingsOptions {
     log: Logger;
@@ -26208,7 +26290,7 @@ export declare interface UnstableDevOptions {
     localProtocol?: "http" | "https";
     httpsKeyPath?: string;
     httpsCertPath?: string;
-    experimentalAssets?: string;
+    assets?: string;
     legacyAssets?: string;
     site?: string;
     siteInclude?: string[];
@@ -26268,6 +26350,7 @@ export declare interface UnstableDevOptions {
         watch?: boolean;
         devEnv?: boolean;
         fileBasedRegistry?: boolean;
+        vectorizeBindToProd?: boolean;
     };
 }
 
@@ -26406,8 +26489,6 @@ declare type WorkflowBinding = {
     class_name: string;
     /** The script where the Workflow is defined (if it's external to this Worker) */
     script_name?: string;
-    /** The service environment of the script_name to bind to */
-    environment?: string;
 };
 
 declare type ZoneIdRoute = {