wrangler 0.0.0-e1c615f → 0.0.0-e6733a3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-e1c615f",
+  "version": "0.0.0-e6733a3",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {
@@ -37,7 +37,7 @@
   ],
   "dependencies": {
     "esbuild": "0.14.1",
-    "miniflare": "2.0.0-rc.5",
+    "miniflare": "2.1.0",
     "path-to-regexp": "^6.2.0",
     "semiver": "^1.1.0"
   },
@@ -59,6 +59,7 @@
     "chokidar": "^3.5.2",
     "clipboardy": "^3.0.0",
     "command-exists": "^1.2.9",
+    "devtools-protocol": "^0.0.955664",
     "execa": "^6.0.0",
     "faye-websocket": "^0.11.4",
     "finalhandler": "^1.1.2",

package/pages/functions/buildWorker.ts

@@ -6,6 +6,7 @@ type Options = {
   outfile: string;
   minify?: boolean;
   sourcemap?: boolean;
+  fallbackService?: string;
   watch?: boolean;
   onEnd?: () => void;
 };
@@ -15,6 +16,7 @@ export function buildWorker({
   outfile = "bundle.js",
   minify = false,
   sourcemap = false,
+  fallbackService = "ASSETS",
   watch = false,
   onEnd = () => {},
 }: Options) {
@@ -31,6 +33,9 @@ export function buildWorker({
     sourcemap,
     watch,
     allowOverwrite: true,
+    define: {
+      __FALLBACK_SERVICE__: JSON.stringify(fallbackService),
+    },
     plugins: [
       {
         name: "wrangler notifier and monitor",

package/pages/functions/template-worker.ts

@@ -29,6 +29,8 @@ type RouteHandler = {
 
 // inject `routes` via ESBuild
 declare const routes: RouteHandler[];
+// define `__FALLBACK_SERVICE__` via ESBuild
+declare const __FALLBACK_SERVICE__: string;
 
 // expect an ASSETS fetcher binding pointing to the asset-server stage
 type Env = {
@@ -40,6 +42,7 @@ type WorkerContext = {
   waitUntil: (promise: Promise<unknown>) => void;
 };
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars -- `env` can be used by __FALLBACK_SERVICE_FETCH__
 function* executeRequest(request: Request, env: Env) {
   const requestPath = new URL(request.url).pathname;
 
@@ -86,9 +89,13 @@ function* executeRequest(request: Request, env: Env) {
     }
   }
 
-  // Finally, yield to the asset-server
+  // Finally, yield to the fallback service (`env.ASSETS.fetch` in Pages' case)
   return {
-    handler: () => env.ASSETS.fetch(request.url, request),
+    handler: () =>
+      __FALLBACK_SERVICE__
+        ? // @ts-expect-error expecting __FALLBACK_SERVICE__ to be the name of a service binding, so fetch should be defined
+          env[__FALLBACK_SERVICE__].fetch(request)
+        : fetch(request),
     params: {} as Params,
   };
 }

package/src/api/worker.ts

@@ -112,7 +112,7 @@ export interface CfWorkerInit {
   /**
    * The name of the worker.
    */
-  name: string | void;
+  name: string | undefined;
   /**
    * The entrypoint module.
    */
@@ -120,7 +120,7 @@ export interface CfWorkerInit {
   /**
    * The list of additional modules.
    */
-  modules: void | CfModule[];
+  modules: undefined | CfModule[];
   /**
    * All the bindings
    */
@@ -130,10 +130,10 @@ export interface CfWorkerInit {
     vars?: CfVars;
     services?: CfService[];
   };
-  migrations: void | CfDurableObjectMigrations;
-  compatibility_date: string | void;
-  compatibility_flags: void | string[];
-  usage_model: void | "bundled" | "unbound";
+  migrations: undefined | CfDurableObjectMigrations;
+  compatibility_date: string | undefined;
+  compatibility_flags: undefined | string[];
+  usage_model: undefined | "bundled" | "unbound";
 }
 
 /**