wrangler 0.0.0-fa045c93 → 0.0.0-fa1016cf

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/config-schema.json

@@ -24,7 +24,8 @@
         "Text",
         "Data",
         "PythonModule",
-        "PythonRequirement"
+        "PythonRequirement",
+        "NodeJsCompatModule"
       ],
       "type": "string"
     },
@@ -478,6 +479,58 @@
           "description": "The entrypoint/path to the JavaScript file that will be executed.",
           "type": "string"
         },
+        "migrations": {
+          "default": [],
+          "description": "A list of migrations that should be uploaded with your Worker.\n\nThese define changes in your Durable Object declarations.\n\nMore details at https://developers.cloudflare.com/workers/learning/using-durable-objects#configuring-durable-object-classes-with-migrations",
+          "items": {
+            "additionalProperties": false,
+            "properties": {
+              "deleted_classes": {
+                "description": "The Durable Objects being removed.",
+                "items": {
+                  "type": "string"
+                },
+                "type": "array"
+              },
+              "new_classes": {
+                "description": "The new Durable Objects being defined.",
+                "items": {
+                  "type": "string"
+                },
+                "type": "array"
+              },
+              "renamed_classes": {
+                "description": "The Durable Objects being renamed.",
+                "items": {
+                  "additionalProperties": false,
+                  "properties": {
+                    "from": {
+                      "type": "string"
+                    },
+                    "to": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "from",
+                    "to"
+                  ],
+                  "type": "object"
+                },
+                "type": "array"
+              },
+              "tag": {
+                "description": "A unique identifier for this migration.",
+                "type": "string"
+              }
+            },
+            "required": [
+              "tag"
+            ],
+            "type": "object"
+          },
+          "type": "array"
+        },
         "minify": {
           "description": "Minify the script before uploading.",
           "type": "boolean"
@@ -919,6 +972,7 @@
         "jsx_fragment",
         "kv_namespaces",
         "logfwdr",
+        "migrations",
         "mtls_certificates",
         "queues",
         "r2_buckets",
@@ -980,6 +1034,13 @@
           ],
           "type": "object"
         },
+        "alias": {
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "A map of module aliases. Lets you swap out a module for any others. Corresponds with esbuild's `alias` config",
+          "type": "object"
+        },
         "analytics_engine_datasets": {
           "default": "`[]`",
           "description": "Specifies analytics engine datasets that are bound to this Worker environment.\n\nNOTE: This field is not automatically inherited from the top level environment, and so must be specified in every named environment.",
@@ -1003,38 +1064,45 @@
           "type": "array"
         },
         "assets": {
-          "additionalProperties": false,
-          "description": "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.",
-          "properties": {
-            "browser_TTL": {
-              "type": "number"
-            },
-            "bucket": {
-              "type": "string"
-            },
-            "exclude": {
-              "items": {
-                "type": "string"
-              },
-              "type": "array"
-            },
-            "include": {
-              "items": {
-                "type": "string"
+          "anyOf": [
+            {
+              "additionalProperties": false,
+              "properties": {
+                "browser_TTL": {
+                  "type": "number"
+                },
+                "bucket": {
+                  "type": "string"
+                },
+                "exclude": {
+                  "items": {
+                    "type": "string"
+                  },
+                  "type": "array"
+                },
+                "include": {
+                  "items": {
+                    "type": "string"
+                  },
+                  "type": "array"
+                },
+                "serve_single_page_app": {
+                  "type": "boolean"
+                }
               },
-              "type": "array"
+              "required": [
+                "bucket",
+                "include",
+                "exclude",
+                "serve_single_page_app"
+              ],
+              "type": "object"
             },
-            "serve_single_page_app": {
-              "type": "boolean"
+            {
+              "type": "string"
             }
-          },
-          "required": [
-            "bucket",
-            "include",
-            "exclude",
-            "serve_single_page_app"
           ],
-          "type": "object"
+          "description": "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."
         },
         "base_dir": {
           "description": "The directory in which module rules should be evaluated when including additional files into a Worker deployment. This defaults to the directory containing the `main` entry point of the Worker if not specified.",
@@ -2389,6 +2457,58 @@
           "description": "The entrypoint/path to the JavaScript file that will be executed.",
           "type": "string"
         },
+        "migrations": {
+          "default": [],
+          "description": "A list of migrations that should be uploaded with your Worker.\n\nThese define changes in your Durable Object declarations.\n\nMore details at https://developers.cloudflare.com/workers/learning/using-durable-objects#configuring-durable-object-classes-with-migrations",
+          "items": {
+            "additionalProperties": false,
+            "properties": {
+              "deleted_classes": {
+                "description": "The Durable Objects being removed.",
+                "items": {
+                  "type": "string"
+                },
+                "type": "array"
+              },
+              "new_classes": {
+                "description": "The new Durable Objects being defined.",
+                "items": {
+                  "type": "string"
+                },
+                "type": "array"
+              },
+              "renamed_classes": {
+                "description": "The Durable Objects being renamed.",
+                "items": {
+                  "additionalProperties": false,
+                  "properties": {
+                    "from": {
+                      "type": "string"
+                    },
+                    "to": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "from",
+                    "to"
+                  ],
+                  "type": "object"
+                },
+                "type": "array"
+              },
+              "tag": {
+                "description": "A unique identifier for this migration.",
+                "type": "string"
+              }
+            },
+            "required": [
+              "tag"
+            ],
+            "type": "object"
+          },
+          "type": "array"
+        },
         "minify": {
           "description": "Minify the script before uploading.",
           "type": "boolean"
@@ -2863,7 +2983,7 @@
       "additionalProperties": false,
       "properties": {
         "environment": {
-          "description": "(Optional) The environt of the service.",
+          "description": "(Optional) The environment of the service.",
           "type": "string"
         },
         "service": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-fa045c93",
+  "version": "0.0.0-fa1016cf",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -47,97 +47,69 @@
     "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
-    }
-  },
   "dependencies": {
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "blake3-wasm": "^2.1.5",
     "chokidar": "^3.5.3",
+    "date-fns": "^3.6.0",
     "esbuild": "0.17.19",
     "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.6.1",
+    "source-map": "^0.6.1",
+    "unenv": "npm:unenv-nightly@1.10.0-1717606461.a117952",
     "xxhash-wasm": "^1.0.1",
-    "@cloudflare/kv-asset-handler": "0.3.2",
-    "miniflare": "3.20240419.1"
+    "@cloudflare/kv-asset-handler": "0.3.4",
+    "miniflare": "3.20240701.0"
   },
   "devDependencies": {
-    "@cloudflare/eslint-config-worker": "*",
     "@cloudflare/types": "^6.18.4",
-    "@cloudflare/workers-types": "^4.20240419.0",
+    "@cloudflare/workers-types": "^4.20240620.0",
     "@cspotcode/source-map-support": "0.8.1",
     "@iarna/toml": "^3.0.0",
-    "@microsoft/api-extractor": "^7.28.3",
+    "@microsoft/api-extractor": "^7.47.0",
     "@sentry/node": "^7.86.0",
     "@sentry/types": "^7.86.0",
     "@sentry/utils": "^7.86.0",
     "@types/body-parser": "^1.19.2",
     "@types/command-exists": "^1.2.0",
     "@types/express": "^4.17.13",
-    "@types/glob-to-regexp": "0.4.1",
+    "@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/mime": "^3.0.4",
     "@types/minimatch": "^5.1.2",
     "@types/prompts": "^2.0.14",
-    "@types/react": "^17.0.37",
+    "@types/react": "^18.2.21",
     "@types/resolve": "^1.20.6",
     "@types/serve-static": "^1.13.10",
     "@types/shell-quote": "^1.7.2",
     "@types/signal-exit": "^3.0.1",
     "@types/supports-color": "^8.1.1",
-    "@types/ws": "^8.5.3",
-    "@types/yargs": "^17.0.10",
+    "@types/ws": "^8.5.7",
+    "@types/yargs": "^17.0.22",
+    "@vitest/ui": "^1.6.0",
     "@webcontainer/env": "^1.1.0",
     "body-parser": "^1.20.0",
-    "chalk": "^2.4.2",
+    "chalk": "^5.2.0",
     "cli-table3": "^0.6.3",
     "clipboardy": "^3.0.0",
     "cmd-shim": "^4.1.0",
     "command-exists": "^1.2.9",
-    "concurrently": "^7.2.2",
-    "devtools-protocol": "^0.0.955664",
+    "concurrently": "^8.2.2",
+    "devtools-protocol": "^0.0.1182435",
     "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",
-    "get-port": "^6.1.2",
-    "glob-to-regexp": "0.4.1",
+    "get-port": "^7.0.0",
+    "glob-to-regexp": "^0.4.1",
     "http-terminator": "^3.2.0",
     "https-proxy-agent": "7.0.2",
     "ignore": "^5.2.0",
@@ -147,53 +119,60 @@
     "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",
     "pretty-bytes": "^6.0.0",
     "prompts": "^2.4.2",
-    "react": "^17.0.2",
+    "ps-list": "^8.1.1",
+    "react": "^18.2.0",
     "react-error-boundary": "^3.1.4",
     "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",
+    "strip-ansi": "^7.1.0",
     "supports-color": "^9.2.2",
     "timeago.js": "^4.0.2",
+    "tree-kill": "^1.2.2",
     "ts-dedent": "^2.2.0",
     "ts-json-schema-generator": "^1.5.0",
-    "undici": "5.28.3",
+    "undici": "^5.28.4",
     "update-check": "^1.5.4",
-    "ws": "^8.5.0",
+    "vitest": "^1.6.0",
+    "vitest-websocket-mock": "^0.3.0",
+    "ws": "^8.17.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.11.34",
     "@cloudflare/cli": "1.1.1",
+    "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/pages-shared": "^0.11.46",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
-  "optionalDependencies": {
-    "fsevents": "~2.3.2"
-  },
   "peerDependencies": {
-    "@cloudflare/workers-types": "^4.20240419.0"
+    "@cloudflare/workers-types": "^4.20240620.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/workers-types": {
       "optional": true
     }
   },
+  "optionalDependencies": {
+    "fsevents": "~2.3.2"
+  },
   "engines": {
     "node": ">=16.17.0"
   },
+  "volta": {
+    "extends": "../../package.json"
+  },
   "workers-sdk": {
     "prerelease": true
   },
@@ -201,17 +180,17 @@
     "assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
     "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 .",
+    "check:lint": "eslint . --max-warnings=0",
     "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\"",
     "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:e2e": "vitest -c ./e2e/vitest.config.mts",
     "test:watch": "pnpm run test --testTimeout=50000 --watch",
     "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
   }

package/templates/checked-fetch.js

@@ -9,7 +9,7 @@ function checkURL(request, init) {
 						? new Request(request, init)
 						: request
 					).url
-			  );
+				);
 	if (url.port && url.port !== "443" && url.protocol === "https:") {
 		if (!urls.has(url.toString())) {
 			urls.add(url.toString());

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/gitignore

@@ -165,3 +165,6 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.\*
+
+.wrangler
+.DS_Store

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/templates/pages-template-plugin.ts

@@ -41,14 +41,14 @@ type EventPluginContext<Env, P extends string, Data, PluginArgs> = {
 declare type PagesFunction<
 	Env = unknown,
 	P extends string = string,
-	Data extends Record<string, unknown> = Record<string, unknown>
+	Data extends Record<string, unknown> = Record<string, unknown>,
 > = (context: EventContext<Env, P, Data>) => Response | Promise<Response>;
 
 declare type PagesPluginFunction<
 	Env = unknown,
 	P extends string = string,
 	Data extends Record<string, unknown> = Record<string, unknown>,
-	PluginArgs = unknown
+	PluginArgs = unknown,
 > = (
 	context: EventPluginContext<Env, P, Data, PluginArgs>
 ) => Response | Promise<Response>;

package/templates/pages-template-worker.ts

@@ -29,7 +29,7 @@ type EventContext<Env, P extends string, Data> = {
 declare type PagesFunction<
 	Env = unknown,
 	P extends string = string,
-	Data extends Record<string, unknown> = Record<string, unknown>
+	Data extends Record<string, unknown> = Record<string, unknown>,
 > = (context: EventContext<Env, P, Data>) => Response | Promise<Response>;
 /* end @cloudflare/workers-types */
 

package/templates/startDevWorker/InspectorProxyWorker.ts

@@ -60,7 +60,10 @@ function isDevToolsEvent<Method extends DevToolsEvents["method"]>(
 }
 
 export class InspectorProxyWorker implements DurableObject {
-	constructor(_state: DurableObjectState, readonly env: Env) {}
+	constructor(
+		_state: DurableObjectState,
+		readonly env: Env
+	) {}
 
 	websockets: {
 		proxyController?: WebSocket;

package/templates/startDevWorker/ProxyWorker.ts

@@ -33,7 +33,10 @@ export default {
 } as ExportedHandler<Env, unknown, ProxyWorkerIncomingRequestBody>;
 
 export class ProxyWorker implements DurableObject {
-	constructor(readonly state: DurableObjectState, readonly env: Env) {}
+	constructor(
+		readonly state: DurableObjectState,
+		readonly env: Env
+	) {}
 
 	proxyData?: ProxyData;
 	requestQueue = new Map<Request, DeferredPromise<Response>>();