wrangler 4.0.0-rc.0 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.0.0-rc.0",
+  "version": "4.1.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -50,18 +50,19 @@
     "config-schema.json"
   ],
   "dependencies": {
+    "@cloudflare/unenv-preset": "2.0.2",
     "blake3-wasm": "2.1.5",
     "esbuild": "0.24.2",
     "path-to-regexp": "6.3.0",
-    "unenv": "2.0.0-rc.1",
-    "workerd": "1.20250214.0",
-    "miniflare": "4.20250214.0-rc.0",
-    "@cloudflare/kv-asset-handler": "0.3.4"
+    "unenv": "2.0.0-rc.14",
+    "workerd": "1.20250317.0",
+    "@cloudflare/kv-asset-handler": "0.4.0",
+    "miniflare": "4.20250317.0"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
     "@cloudflare/types": "6.18.4",
-    "@cloudflare/workers-types": "^4.20250214.0",
+    "@cloudflare/workers-types": "^4.20250317.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.47.0",
@@ -99,7 +100,6 @@
     "get-port": "^7.0.0",
     "glob-to-regexp": "^0.4.1",
     "https-proxy-agent": "7.0.2",
-    "ignore": "^5.2.0",
     "is-ci": "^3.0.1",
     "itty-time": "^1.0.6",
     "javascript-time-ago": "^2.5.4",
@@ -137,12 +137,12 @@
     "yargs": "^17.7.2",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "^0.13.10",
-    "@cloudflare/workers-shared": "0.14.4",
+    "@cloudflare/pages-shared": "^0.13.15",
+    "@cloudflare/workers-shared": "0.16.0",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20250214.0"
+    "@cloudflare/workers-types": "^4.20250317.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {
@@ -167,7 +167,7 @@
     "build": "pnpm run clean && pnpm run bundle && pnpm run emit-types && pnpm run generate-json-schema",
     "bundle": "node -r esbuild-register scripts/bundle.ts",
     "check:lint": "eslint . --max-warnings=0",
-    "check:type": "tsc",
+    "check:type": "tsc -p ./tsconfig.json && tsc -p ./templates/tsconfig.json",
     "clean": "rimraf wrangler-dist miniflare-dist emitted-types",
     "dev": "pnpm run clean && concurrently -c black,blue --kill-others-on-fail false \"pnpm run bundle --watch\" \"pnpm run check:type --watch --preserveWatchOutput\"",
     "emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",

package/templates/pages-dev-pipeline.ts

@@ -20,10 +20,11 @@ export default <ExportedHandler<{ ASSETS: Fetcher }>>{
 
 		for (const include of routes.include) {
 			if (isRoutingRuleMatch(pathname, include)) {
-				if (worker.fetch === undefined) {
+				const workerAsHandler = worker as ExportedHandler;
+				if (workerAsHandler.fetch === undefined) {
 					throw new TypeError("Entry point missing `fetch` handler");
 				}
-				return worker.fetch(request, env, context);
+				return workerAsHandler.fetch(request, env, context);
 			}
 		}
 

package/templates/tsconfig.json

@@ -4,5 +4,12 @@
 		"types": ["@cloudflare/workers-types"]
 	},
 	"include": ["**/*.ts"],
-	"exclude": ["__tests__", "./init-tests/**"]
+	"exclude": [
+		"__tests__",
+		"./init-tests/**",
+		// Note: `startDevWorker` and `middleware` should also be included but some work is needed
+		//       for that first (see: https://github.com/cloudflare/workers-sdk/issues/8303)
+		"startDevWorker",
+		"middleware"
+	]
 }

package/wrangler-dist/cli.d.ts

@@ -74,20 +74,137 @@ declare type ApiCredentials = {
 declare type AssetConfig = z.infer<typeof AssetConfigSchema>;
 
 declare const AssetConfigSchema: z.ZodObject<{
+    account_id: z.ZodOptional<z.ZodNumber>;
+    script_id: z.ZodOptional<z.ZodNumber>;
+    compatibility_date: z.ZodOptional<z.ZodString>;
+    compatibility_flags: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     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"]>>;
-    serve_directly: z.ZodOptional<z.ZodBoolean>;
-    run_worker_first: z.ZodOptional<z.ZodBoolean>;
+    redirects: z.ZodOptional<z.ZodObject<{
+        version: z.ZodLiteral<1>;
+        staticRules: z.ZodRecord<z.ZodString, z.ZodObject<{
+            status: z.ZodNumber;
+            to: z.ZodString;
+            lineNumber: z.ZodNumber;
+        }, "strip", z.ZodTypeAny, {
+            status?: number;
+            to?: string;
+            lineNumber?: number;
+        }, {
+            status?: number;
+            to?: string;
+            lineNumber?: number;
+        }>>;
+        rules: z.ZodRecord<z.ZodString, z.ZodObject<{
+            status: z.ZodNumber;
+            to: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            status?: number;
+            to?: string;
+        }, {
+            status?: number;
+            to?: string;
+        }>>;
+    }, "strip", z.ZodTypeAny, {
+        version?: 1;
+        staticRules?: Record<string, {
+            status?: number;
+            to?: string;
+            lineNumber?: number;
+        }>;
+        rules?: Record<string, {
+            status?: number;
+            to?: string;
+        }>;
+    }, {
+        version?: 1;
+        staticRules?: Record<string, {
+            status?: number;
+            to?: string;
+            lineNumber?: number;
+        }>;
+        rules?: Record<string, {
+            status?: number;
+            to?: string;
+        }>;
+    }>>;
+    headers: z.ZodOptional<z.ZodObject<{
+        version: z.ZodLiteral<2>;
+        rules: z.ZodRecord<z.ZodString, z.ZodObject<{
+            set: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+            unset: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        }, "strip", z.ZodTypeAny, {
+            set?: Record<string, string>;
+            unset?: string[];
+        }, {
+            set?: Record<string, string>;
+            unset?: string[];
+        }>>;
+    }, "strip", z.ZodTypeAny, {
+        version?: 2;
+        rules?: Record<string, {
+            set?: Record<string, string>;
+            unset?: string[];
+        }>;
+    }, {
+        version?: 2;
+        rules?: Record<string, {
+            set?: Record<string, string>;
+            unset?: string[];
+        }>;
+    }>>;
 }, "strip", z.ZodTypeAny, {
+    account_id?: number;
+    script_id?: number;
+    compatibility_date?: string;
+    compatibility_flags?: string[];
     html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";
     not_found_handling?: "none" | "single-page-application" | "404-page";
-    serve_directly?: boolean;
-    run_worker_first?: boolean;
+    redirects?: {
+        version?: 1;
+        staticRules?: Record<string, {
+            status?: number;
+            to?: string;
+            lineNumber?: number;
+        }>;
+        rules?: Record<string, {
+            status?: number;
+            to?: string;
+        }>;
+    };
+    headers?: {
+        version?: 2;
+        rules?: Record<string, {
+            set?: Record<string, string>;
+            unset?: string[];
+        }>;
+    };
 }, {
+    account_id?: number;
+    script_id?: number;
+    compatibility_date?: string;
+    compatibility_flags?: string[];
     html_handling?: "none" | "auto-trailing-slash" | "force-trailing-slash" | "drop-trailing-slash";
     not_found_handling?: "none" | "single-page-application" | "404-page";
-    serve_directly?: boolean;
-    run_worker_first?: boolean;
+    redirects?: {
+        version?: 1;
+        staticRules?: Record<string, {
+            status?: number;
+            to?: string;
+            lineNumber?: number;
+        }>;
+        rules?: Record<string, {
+            status?: number;
+            to?: string;
+        }>;
+    };
+    headers?: {
+        version?: 2;
+        rules?: Record<string, {
+            set?: Record<string, string>;
+            unset?: string[];
+        }>;
+    };
 }>;
 
 declare type Assets = {
@@ -109,8 +226,10 @@ declare type Assets = {
 declare type AssetsOptions = {
     directory: string;
     binding?: string;
-    routingConfig: RoutingConfig;
+    routerConfig: RouterConfig;
     assetConfig: AssetConfig;
+    _redirects?: string;
+    _headers?: string;
 };
 
 declare type AsyncHook<T extends HookValues, Args extends unknown[] = []> = Hook<T, Args> | Hook<Promise<T>, Args>;
@@ -25862,23 +25981,23 @@ declare namespace RetryHandler {
 
 declare type Route = SimpleRoute | ZoneIdRoute | ZoneNameRoute | CustomDomainRoute;
 
-declare type RoutingConfig = z.infer<typeof RoutingConfigSchema>;
+declare type RouterConfig = z.infer<typeof RouterConfigSchema>;
 
-declare const RoutingConfigSchema: z.ZodObject<{
-    has_user_worker: z.ZodOptional<z.ZodBoolean>;
-    invoke_user_worker_ahead_of_assets: z.ZodOptional<z.ZodBoolean>;
+declare const RouterConfigSchema: z.ZodObject<{
     account_id: z.ZodOptional<z.ZodNumber>;
     script_id: z.ZodOptional<z.ZodNumber>;
+    invoke_user_worker_ahead_of_assets: z.ZodOptional<z.ZodBoolean>;
+    has_user_worker: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    has_user_worker?: boolean;
-    invoke_user_worker_ahead_of_assets?: boolean;
     account_id?: number;
     script_id?: number;
-}, {
-    has_user_worker?: boolean;
     invoke_user_worker_ahead_of_assets?: boolean;
+    has_user_worker?: boolean;
+}, {
     account_id?: number;
     script_id?: number;
+    invoke_user_worker_ahead_of_assets?: boolean;
+    has_user_worker?: boolean;
 }>;
 
 /**
@@ -26393,14 +26512,19 @@ export declare interface Unstable_DevWorker {
 
 export declare const unstable_generateASSETSBinding: (opts: Unstable_ASSETSBindingsOptions) => (request: Request_3) => Promise<Response_3>;
 
-export declare function unstable_getMiniflareWorkerOptions(configPath: string, env?: string): Unstable_MiniflareWorkerOptions;
+export declare function unstable_getMiniflareWorkerOptions(configPath: string, env?: string, options?: {
+    imagesLocalMode: boolean;
+}): Unstable_MiniflareWorkerOptions;
 
-export declare function unstable_getMiniflareWorkerOptions(config: Unstable_Config, env?: string): Unstable_MiniflareWorkerOptions;
+export declare function unstable_getMiniflareWorkerOptions(config: Unstable_Config, env?: string, options?: {
+    imagesLocalMode: boolean;
+}): Unstable_MiniflareWorkerOptions;
 
 export declare interface Unstable_MiniflareWorkerOptions {
     workerOptions: SourcelessWorkerOptions;
     define: Record<string, string>;
     main?: string;
+    externalWorkers: WorkerOptions[];
 }
 
 export declare const unstable_pages: {