wrangler 0.0.0-e3990bbf → 0.0.0-e3a57616

package/bin/wrangler.js

@@ -76,6 +76,11 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
 			if (process.send) {
 				process.send(message);
 			}
+		})
+		.on("disconnect", () => {
+			if (process.disconnect) {
+				process.disconnect();
+			}
 		});
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-e3990bbf",
+  "version": "0.0.0-e3a57616",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -75,8 +75,12 @@
       ]
     },
     "transformIgnorePatterns": [
-      "node_modules/.pnpm/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes|npx-import)"
-    ]
+      "node_modules/.pnpm/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes)"
+    ],
+    "snapshotFormat": {
+      "escapeString": true,
+      "printBasicPrototype": true
+    }
   },
   "dependencies": {
     "@cloudflare/kv-asset-handler": "^0.2.0",
@@ -85,20 +89,26 @@
     "blake3-wasm": "^2.1.5",
     "chokidar": "^3.5.3",
     "esbuild": "0.17.19",
-    "miniflare": "3.20230904.0",
     "nanoid": "^3.3.3",
     "path-to-regexp": "^6.2.0",
+    "resolve": "^1.22.8",
+    "resolve.exports": "^2.0.2",
     "selfsigned": "^2.0.1",
-    "source-map": "^0.7.4",
-    "xxhash-wasm": "^1.0.1"
+    "source-map": "0.6.1",
+    "xxhash-wasm": "^1.0.1",
+    "miniflare": "3.20231218.3"
   },
   "devDependencies": {
+    "@cloudflare/ai": "^1.0.35",
     "@cloudflare/eslint-config-worker": "*",
     "@cloudflare/types": "^6.18.4",
-    "@cloudflare/workers-types": "^4.20230724.0",
+    "@cloudflare/workers-types": "^4.20230914.0",
+    "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.28.3",
-    "@types/better-sqlite3": "^7.6.0",
+    "@sentry/node": "^7.86.0",
+    "@sentry/types": "^7.86.0",
+    "@sentry/utils": "^7.86.0",
     "@types/body-parser": "^1.19.2",
     "@types/busboy": "^1.5.0",
     "@types/command-exists": "^1.2.0",
@@ -106,12 +116,16 @@
     "@types/glob-to-regexp": "0.4.1",
     "@types/is-ci": "^3.0.0",
     "@types/javascript-time-ago": "^2.0.3",
+    "@types/jest": "^29.5.5",
     "@types/mime": "^2.0.3",
     "@types/minimatch": "^5.1.2",
     "@types/prompts": "^2.0.14",
     "@types/react": "^17.0.37",
+    "@types/resolve": "^1.20.6",
     "@types/serve-static": "^1.13.10",
+    "@types/shell-quote": "^1.7.2",
     "@types/signal-exit": "^3.0.1",
+    "@types/source-map-support": "^0.5.7",
     "@types/supports-color": "^8.1.1",
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.10",
@@ -125,6 +139,7 @@
     "concurrently": "^7.2.2",
     "devtools-protocol": "^0.0.955664",
     "dotenv": "^16.0.0",
+    "esbuild-jest": "0.5.0",
     "execa": "^6.1.0",
     "express": "^4.18.1",
     "finalhandler": "^1.2.0",
@@ -132,6 +147,7 @@
     "get-port": "^6.1.2",
     "glob-to-regexp": "0.4.1",
     "http-terminator": "^3.2.0",
+    "https-proxy-agent": "7.0.2",
     "ignore": "^5.2.0",
     "ink": "^3.2.0",
     "ink-select-input": "^4.2.1",
@@ -141,12 +157,12 @@
     "ink-text-input": "^4.0.3",
     "is-ci": "^3.0.1",
     "javascript-time-ago": "^2.5.4",
+    "jest": "^29.7.0",
     "jest-fetch-mock": "^3.0.3",
-    "jest-websocket-mock": "^2.3.0",
+    "jest-websocket-mock": "^2.5.0",
     "mime": "^3.0.0",
     "minimatch": "^5.1.0",
     "msw": "^0.49.1",
-    "npx-import": "^1.1.3",
     "open": "^8.4.0",
     "p-queue": "^7.2.0",
     "patch-console": "^1.0.0",
@@ -157,28 +173,31 @@
     "remove-accents-esm": "^0.0.1",
     "semiver": "^1.1.0",
     "serve-static": "^1.15.0",
+    "shell-quote": "^1.8.1",
     "shellac": "^0.8.0",
     "signal-exit": "^3.0.7",
     "strip-ansi": "^7.0.1",
     "supports-color": "^9.2.2",
     "timeago.js": "^4.0.2",
-    "tmp-promise": "^3.0.3",
     "ts-dedent": "^2.2.0",
-    "undici": "5.20.0",
+    "undici": "5.28.2",
     "update-check": "^1.5.4",
-    "vitest": "^0.31.0",
     "ws": "^8.5.0",
-    "xdg-app-paths": "^7.3.0",
-    "yargs": "^17.4.1",
+    "xdg-app-paths": "^8.3.0",
+    "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
-    "@cloudflare/pages-shared": "^0.9.0",
+    "@cloudflare/cli": "1.1.1",
+    "@cloudflare/pages-shared": "^0.11.8",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
   },
   "engines": {
-    "node": ">=16.13.0"
+    "node": ">=16.17.0"
+  },
+  "workers-sdk": {
+    "prerelease": true
   },
   "scripts": {
     "assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
@@ -187,14 +206,14 @@
     "check:lint": "eslint .",
     "check:type": "tsc",
     "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'",
+    "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",
     "start": "pnpm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
     "test": "pnpm run assert-git-version && jest",
     "test:ci": "pnpm run test --coverage",
     "test:debug": "pnpm run test --silent=false --verbose=true",
-    "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e run",
-    "test:watch": "pnpm run test --runInBand --testTimeout=50000 --watch",
+    "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e --retry 2 run",
+    "test:watch": "pnpm run test --testTimeout=50000 --watch",
     "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
   }
 }

package/templates/init-tests/test-vitest-new-worker.js

@@ -1,5 +1,5 @@
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import { unstable_dev } from "wrangler";
-import { describe, expect, it, beforeAll, afterAll } from "vitest";
 
 describe("Worker", () => {
 	let worker;

package/templates/init-tests/test-vitest-new-worker.ts

@@ -1,6 +1,6 @@
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import { unstable_dev } from "wrangler";
 import type { UnstableDevWorker } from "wrangler";
-import { describe, expect, it, beforeAll, afterAll } from "vitest";
 
 describe("Worker", () => {
 	let worker: UnstableDevWorker;

package/templates/middleware/loader-modules.ts

@@ -4,15 +4,14 @@
 // // through wrangler, or we can potentially let users directly add them as a sort
 // // of "plugin" system.
 
+import worker from "__ENTRY_POINT__";
 import {
-	Dispatcher,
-	Middleware,
 	__facade_invoke__,
 	__facade_register__,
+	Dispatcher,
+	Middleware,
 } from "./common";
 
-import worker from "__ENTRY_POINT__";
-
 // We need to preserve all of the exports from the worker
 export * from "__ENTRY_POINT__";
 

package/templates/middleware/loader-sw.ts

@@ -1,12 +1,13 @@
 import {
+	__facade_invoke__,
+	__facade_register__,
+	__facade_registerInternal__,
 	Awaitable,
 	Dispatcher,
 	IncomingRequest,
 	Middleware,
-	__facade_invoke__,
-	__facade_register__,
-	__facade_registerInternal__,
 } from "./common";
+
 export { __facade_register__, __facade_registerInternal__ };
 
 // Miniflare 2's `EventTarget` follows the spec and doesn't allow exceptions to

package/templates/middleware/middleware-multiworker-dev.ts

@@ -4,6 +4,42 @@
 import { workers } from "config:middleware/multiworker-dev";
 import type { WorkerRegistry } from "../../src/dev-registry";
 
+class Fetcher {
+	#name: string;
+	#details: WorkerRegistry[string];
+	constructor(name: string, details: WorkerRegistry[string]) {
+		this.#name = name;
+		this.#details = details;
+	}
+
+	async fetch(...reqArgs: Parameters<Fetcher["fetch"]>) {
+		const reqFromArgs = new Request(...reqArgs);
+		if (this.#details.headers) {
+			for (const [key, value] of Object.entries(this.#details.headers)) {
+				// In remote mode, you need to add a couple of headers
+				// to make sure it's talking to the 'dev' preview session
+				// (much like wrangler dev already does via proxy.ts)
+				reqFromArgs.headers.set(key, value);
+			}
+			return (env[this.#name] as Fetcher).fetch(reqFromArgs);
+		}
+
+		const url = new URL(reqFromArgs.url);
+		if (this.#details.protocol !== undefined) {
+			url.protocol = this.#details.protocol;
+		}
+		if (this.#details.host !== undefined) {
+			url.host = this.#details.host;
+		}
+		if (this.#details.port !== undefined) {
+			url.port = this.#details.port.toString();
+		}
+
+		const request = new Request(url.toString(), reqFromArgs);
+		return fetch(request);
+	}
+}
+
 export function wrap(env: Record<string, unknown>) {
 	const facadeEnv = { ...env };
 	// For every Worker definition that's available,
@@ -14,34 +50,7 @@ export function wrap(env: Record<string, unknown>) {
 
 	for (const [name, details] of Object.entries(workers as WorkerRegistry)) {
 		if (details) {
-			facadeEnv[name] = {
-				async fetch(...reqArgs: Parameters<Fetcher["fetch"]>) {
-					const reqFromArgs = new Request(...reqArgs);
-					if (details.headers) {
-						for (const [key, value] of Object.entries(details.headers)) {
-							// In remote mode, you need to add a couple of headers
-							// to make sure it's talking to the 'dev' preview session
-							// (much like wrangler dev already does via proxy.ts)
-							reqFromArgs.headers.set(key, value);
-						}
-						return (env[name] as Fetcher).fetch(reqFromArgs);
-					}
-
-					const url = new URL(reqFromArgs.url);
-					if (details.protocol !== undefined) {
-						url.protocol = details.protocol;
-					}
-					if (details.host !== undefined) {
-						url.host = details.host;
-					}
-					if (details.port !== undefined) {
-						url.port = details.port.toString();
-					}
-
-					const request = new Request(url.toString(), reqFromArgs);
-					return fetch(request);
-				},
-			};
+			facadeEnv[name] = new Fetcher(name, details);
 		} else {
 			// This means there's no dev binding available.
 			// Let's use whatever's available, or put a shim with a message.

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

@@ -1,18 +1,18 @@
 /// <reference path="middleware-serve-static-assets.d.ts"/>
 
+import manifest from "__STATIC_CONTENT_MANIFEST";
 import {
 	getAssetFromKV,
-	NotFoundError,
 	MethodNotAllowedError,
+	NotFoundError,
 	serveSinglePageApp,
 } from "@cloudflare/kv-asset-handler";
+import { cacheControl, spaMode } from "config:middleware/serve-static-assets";
+import type { Middleware } from "./common";
 import type { Options } from "@cloudflare/kv-asset-handler";
-import { spaMode, cacheControl } from "config:middleware/serve-static-assets";
 import type * as kvAssetHandler from "@cloudflare/kv-asset-handler";
-import manifest from "__STATIC_CONTENT_MANIFEST";
-const ASSET_MANIFEST = JSON.parse(manifest);
 
-import type { Middleware } from "./common";
+const ASSET_MANIFEST = JSON.parse(manifest);
 
 const staticAssets: Middleware = async (request, env, _ctx, middlewareCtx) => {
 	let options: Partial<Options> = {

package/templates/modules-watch-stub.js

@@ -0,0 +1,4 @@
+// `esbuild` doesn't support returning `watch*` options from `onStart()`
+// plugin callbacks. Instead, we define an empty virtual module that is
+// imported by this injected file. Importing the module registers watchers.
+import "wrangler:modules-watch";

package/templates/pages-dev-pipeline.ts

@@ -1,8 +1,9 @@
 // @ts-ignore entry point will get replaced
 import worker from "__ENTRY_POINT__";
+import { isRoutingRuleMatch } from "./pages-dev-util";
+
 // @ts-ignore entry point will get replaced
 export * from "__ENTRY_POINT__";
-import { isRoutingRuleMatch } from "./pages-dev-util";
 
 // @ts-ignore routes are injected
 const routes = __ROUTES__;