wrangler 3.57.0 → 3.57.2

package/bin/wrangler.js

@@ -28,30 +28,6 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
 		return;
 	}
 
-	let pathToCACerts = process.env.NODE_EXTRA_CA_CERTS;
-	if (pathToCACerts) {
-		// TODO:
-		// - should we log a warning here?
-		// - maybe we can generate a certificate that concatenates with ours?
-		//
-		//  I do think it'll be rare that someone wants to add a cert AND
-		//  use Cloudflare WARP, but let's wait till the situation actually
-		//  arises before we do anything about it
-	} else {
-		const osTempDir = os.tmpdir();
-		const certDir = path.join(osTempDir, "wrangler-cert");
-		const certPath = path.join(certDir, "Cloudflare_CA.pem");
-		// copy cert to the system temp dir if needed
-		if (!fs.existsSync(certPath)) {
-			fs.mkdirSync(certDir, { recursive: true });
-			fs.writeFileSync(
-				certPath,
-				fs.readFileSync(path.join(__dirname, "../Cloudflare_CA.pem"), "utf-8")
-			);
-		}
-		pathToCACerts = certPath;
-	}
-
 	return spawn(
 		process.execPath,
 		[
@@ -63,10 +39,6 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
 		],
 		{
 			stdio: ["inherit", "inherit", "inherit", "ipc"],
-			env: {
-				...process.env,
-				NODE_EXTRA_CA_CERTS: pathToCACerts,
-			},
 		}
 	)
 		.on("exit", (code) =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.57.0",
+  "version": "3.57.2",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -47,37 +47,8 @@
     "wrangler-dist",
     "templates",
     "kv-asset-handler.js",
-    "Cloudflare_CA.pem",
     "config-schema.json"
   ],
-  "jest": {
-    "moduleNameMapper": {
-      "clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",
-      "miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js"
-    },
-    "restoreMocks": true,
-    "setupFilesAfterEnv": [
-      "<rootDir>/src/__tests__/jest.setup.ts"
-    ],
-    "testRegex": "src/__tests__/.*\\.(test|spec)\\.[jt]sx?$",
-    "testTimeout": 50000,
-    "transform": {
-      "^.+\\.c?(t|j)sx?$": [
-        "esbuild-jest",
-        {
-          "sourcemap": true
-        }
-      ]
-    },
-    "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|strip-ansi|ansi-regex)"
-    ],
-    "snapshotFormat": {
-      "escapeString": true,
-      "printBasicPrototype": true
-    },
-    "prettierPath": null
-  },
   "dependencies": {
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
@@ -92,11 +63,11 @@
     "source-map": "0.6.1",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.2",
-    "miniflare": "3.20240512.0"
+    "miniflare": "3.20240524.0"
   },
   "devDependencies": {
     "@cloudflare/types": "^6.18.4",
-    "@cloudflare/workers-types": "^4.20240512.0",
+    "@cloudflare/workers-types": "^4.20240524.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.28.3",
@@ -109,7 +80,6 @@
     "@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",
@@ -133,7 +103,6 @@
     "devtools-protocol": "^0.0.955664",
     "dotenv": "^16.0.0",
     "es-module-lexer": "^1.3.0",
-    "esbuild-jest": "0.5.0",
     "execa": "^6.1.0",
     "express": "^4.18.1",
     "find-up": "^6.3.0",
@@ -148,13 +117,11 @@
     "ink-table": "^3.0.0",
     "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.5.0",
     "md5-file": "5.0.0",
     "mime": "^3.0.0",
     "minimatch": "^5.1.0",
-    "msw": "^0.49.1",
+    "mock-socket": "^9.3.1",
+    "msw": "^2.3.0",
     "open": "^8.4.0",
     "p-queue": "^7.2.0",
     "patch-console": "^1.0.0",
@@ -176,20 +143,21 @@
     "undici": "5.28.4",
     "update-check": "^1.5.4",
     "vitest": "^1.6.0",
+    "vitest-websocket-mock": "^0.3.0",
     "ws": "^8.5.0",
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
-    "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "^0.11.36",
-    "@cloudflare/workers-tsconfig": "0.0.0"
+    "@cloudflare/cli": "1.1.1",
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "@cloudflare/pages-shared": "^0.11.39"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
   },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20240512.0"
+    "@cloudflare/workers-types": "^4.20240524.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {
@@ -213,8 +181,8 @@
     "emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
     "generate-json-schema": "pnpm exec ts-json-schema-generator --no-type-check --path src/config/config.ts --type RawConfig --out config-schema.json",
     "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",
+    "test": "pnpm run assert-git-version && vitest",
+    "test:ci": "pnpm run test run",
     "test:debug": "pnpm run test --silent=false --verbose=true",
     "test:e2e": "vitest -c ./e2e/vitest.config.ts",
     "test:watch": "pnpm run test --testTimeout=50000 --watch",

package/templates/facade.d.ts

@@ -3,10 +3,10 @@ declare module "__ENTRY_POINT__" {
 	import { WorkerEntrypoint } from "cloudflare:workers";
 
 	export type WorkerEntrypointConstructor = typeof WorkerEntrypoint;
-	export type WithMiddleware<T> = T & { middleware?: Middleware[] };
 
-	const worker: WithMiddleware<ExportedHandler | WorkerEntrypointConstructor>;
+	const worker: ExportedHandler | WorkerEntrypointConstructor;
 	export default worker;
+	export const __INTERNAL_WRANGLER_MIDDLEWARE__: Middleware[];
 }
 
 declare module "__KV_ASSET_HANDLER__" {

package/templates/middleware/loader-modules.ts

@@ -3,12 +3,9 @@
 // export dynamically through wrangler, or we can potentially let users directly
 // add them as a sort of "plugin" system.
 
-import ENTRY from "__ENTRY_POINT__";
+import ENTRY, { __INTERNAL_WRANGLER_MIDDLEWARE__ } from "__ENTRY_POINT__";
 import { __facade_invoke__, __facade_register__, Dispatcher } from "./common";
-import type {
-	WithMiddleware,
-	WorkerEntrypointConstructor,
-} from "__ENTRY_POINT__";
+import type { WorkerEntrypointConstructor } from "__ENTRY_POINT__";
 
 // Preserve all the exports from the worker
 export * from "__ENTRY_POINT__";
@@ -33,15 +30,16 @@ class __Facade_ScheduledController__ implements ScheduledController {
 	}
 }
 
-function wrapExportedHandler(
-	worker: WithMiddleware<ExportedHandler>
-): ExportedHandler {
+function wrapExportedHandler(worker: ExportedHandler): ExportedHandler {
 	// If we don't have any middleware defined, just return the handler as is
-	if (worker.middleware === undefined || worker.middleware.length === 0) {
+	if (
+		__INTERNAL_WRANGLER_MIDDLEWARE__ === undefined ||
+		__INTERNAL_WRANGLER_MIDDLEWARE__.length === 0
+	) {
 		return worker;
 	}
 	// Otherwise, register all middleware once
-	for (const middleware of worker.middleware) {
+	for (const middleware of __INTERNAL_WRANGLER_MIDDLEWARE__) {
 		__facade_register__(middleware);
 	}
 
@@ -75,14 +73,17 @@ function wrapExportedHandler(
 }
 
 function wrapWorkerEntrypoint(
-	klass: WithMiddleware<WorkerEntrypointConstructor>
+	klass: WorkerEntrypointConstructor
 ): WorkerEntrypointConstructor {
 	// If we don't have any middleware defined, just return the handler as is
-	if (klass.middleware === undefined || klass.middleware.length === 0) {
+	if (
+		__INTERNAL_WRANGLER_MIDDLEWARE__ === undefined ||
+		__INTERNAL_WRANGLER_MIDDLEWARE__.length === 0
+	) {
 		return klass;
 	}
 	// Otherwise, register all middleware once
-	for (const middleware of klass.middleware) {
+	for (const middleware of __INTERNAL_WRANGLER_MIDDLEWARE__) {
 		__facade_register__(middleware);
 	}
 

package/wrangler-dist/cli.d.ts

@@ -2462,6 +2462,21 @@ declare interface Interceptable extends Dispatcher {
     intercept(options: MockInterceptor.Options): MockInterceptor;
 }
 
+declare class Logger {
+    constructor();
+    loggerLevel: "none" | "error" | "warn" | "info" | "log" | "debug";
+    columns: number;
+    debug: (...args: unknown[]) => void;
+    debugWithSanitization: (label: string, ...args: unknown[]) => void;
+    info: (...args: unknown[]) => void;
+    log: (...args: unknown[]) => void;
+    warn: (...args: unknown[]) => void;
+    error: (...args: unknown[]) => void;
+    table<Keys extends string>(data: TableRow<Keys>[]): void;
+    private doLog;
+    private formatMessage;
+}
+
 declare type LogLevel = "debug" | "info" | "log" | "warn" | "error" | "none";
 
 declare type MaybePromise<T> = T | Promise<T>;
@@ -23652,6 +23667,8 @@ options: { dispatcher?: Dispatcher } & Omit<Dispatcher.RequestOptions, 'origin'
 factory: Dispatcher.StreamFactory
 ): Promise<Dispatcher.StreamData>;
 
+declare type TableRow<Keys extends string> = Record<Keys, string>;
+
 declare type TailConsumer = {
     /** The name of the service tail events will be forwarded to. */
     service: string;
@@ -23829,6 +23846,8 @@ export declare class unstable_DevEnv extends EventEmitter_2 {
     emitErrorEvent(ev: ErrorEvent): void;
 }
 
+export declare const unstable_generateASSETSBinding: (opts: UnstableASSETSBindingsOptions) => (request: Request_2) => Promise<Response_2>;
+
 export declare function unstable_getMiniflareWorkerOptions(configPath: string, environment?: string): {
     workerOptions: SourcelessWorkerOptions;
     define: Record<string, string>;
@@ -23849,6 +23868,12 @@ export declare function unstable_startWorkerRegistryServer(port: number): Promis
     terminator: HttpTerminator;
 }>;
 
+export declare interface UnstableASSETSBindingsOptions {
+    log: Logger;
+    proxyPort?: number;
+    directory?: string;
+}
+
 export declare interface UnstableDevOptions {
     config?: string;
     env?: string;