wrangler 0.0.0-d72722f0 → 0.0.0-d74c35fc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-d72722f0",
+  "version": "0.0.0-d74c35fc",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -89,7 +89,7 @@
     "blake3-wasm": "^2.1.5",
     "chokidar": "^3.5.3",
     "esbuild": "0.17.19",
-    "miniflare": "3.20230918.0",
+    "miniflare": "3.20231016.0",
     "nanoid": "^3.3.3",
     "path-to-regexp": "^6.2.0",
     "selfsigned": "^2.0.1",
@@ -100,7 +100,7 @@
   "devDependencies": {
     "@cloudflare/eslint-config-worker": "*",
     "@cloudflare/types": "^6.18.4",
-    "@cloudflare/workers-types": "^4.20230724.0",
+    "@cloudflare/workers-types": "^4.20230914.0",
     "@iarna/toml": "^3.0.0",
     "@microsoft/api-extractor": "^7.28.3",
     "@types/body-parser": "^1.19.2",
@@ -110,20 +110,19 @@
     "@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/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",
     "@webcontainer/env": "^1.1.0",
-    "@types/jest": "^29.5.5",
-    "esbuild-jest": "0.5.0",
-    "jest": "^29.7.0",
     "body-parser": "^1.20.0",
     "chalk": "^2.4.2",
     "cli-table3": "^0.6.3",
@@ -133,6 +132,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",
@@ -149,6 +149,7 @@
     "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.5.0",
     "mime": "^3.0.0",
@@ -165,6 +166,7 @@
     "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",
@@ -176,10 +178,10 @@
     "update-check": "^1.5.4",
     "vitest": "^0.34.4",
     "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/pages-shared": "^0.10.1",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {

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/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/wrangler-dist/cli.d.ts

@@ -251,8 +251,6 @@ declare type CustomDomainRoute = {
     custom_domain: boolean;
 };
 
-export declare function deleteMTlsCertificate(accountId: string, certificateId: string): Promise<unknown>;
-
 /**
  * Publish a directory to an account/project.
  * NOTE: You will need the `CLOUDFLARE_API_KEY` environment
@@ -655,8 +653,18 @@ declare interface EnvironmentInheritable {
      */
     main: string | undefined;
     /**
-     * The directory in which module rules should be evaluated in a `--no-bundle` worker
-     * This defaults to dirname(main) when left undefined
+     * If true then Wrangler will traverse the file tree below `base_dir`;
+     * Any files that match `rules` will be included in the deployed worker.
+     * Defaults to true if `no_bundle` is true, otherwise false.
+     *
+     * @inheritable
+     */
+    find_additional_modules: boolean | undefined;
+    /**
+     * 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.
+     *
+     * @inheritable
      */
     base_dir: string | undefined;
     /**
@@ -730,6 +738,13 @@ declare interface EnvironmentInheritable {
      * @inheritable
      */
     usage_model: "bundled" | "unbound" | undefined;
+    /**
+     * Specify limits for runtime behavior.
+     * Only supported for the "standard" Usage Model
+     *
+     * @inheritable
+     */
+    limits: UserLimits | undefined;
     /**
      * An ordered list of rules that define which modules to import,
      * and what type to import them as. You will need to specify rules
@@ -996,6 +1011,21 @@ declare interface EnvironmentNonInheritable {
         /** Internal use only. */
         database_internal_env?: string;
     }[];
+    /**
+     * Specifies Vectorize indexes that are bound to this Worker environment.
+     *
+     * NOTE: This field is not automatically inherited from the top level environment,
+     * and so must be specified in every named environment.
+     *
+     * @default `[]`
+     * @nonInheritable
+     */
+    vectorize: {
+        /** The binding name used to refer to the Vectorize index in the worker. */
+        binding: string;
+        /** The name of the index. */
+        index_name: string;
+    }[];
     /**
      * Specifies Constellation projects that are bound to this Worker environment.
      *
@@ -1011,6 +1041,21 @@ declare interface EnvironmentNonInheritable {
         /** The id of the project. */
         project_id: string;
     }[];
+    /**
+     * Specifies Hyperdrive configs that are bound to this Worker environment.
+     *
+     * NOTE: This field is not automatically inherited from the top level environment,
+     * and so must be specified in every named environment.
+     *
+     * @default `[]`
+     * @nonInheritable
+     */
+    hyperdrive: {
+        /** The binding name used to refer to the project in the worker. */
+        binding: string;
+        /** The id of the database. */
+        id: string;
+    }[];
     /**
      * Specifies service bindings (worker-to-worker) that are bound to this Worker environment.
      *
@@ -1049,6 +1094,12 @@ declare interface EnvironmentNonInheritable {
     browser: {
         binding: string;
     } | undefined;
+    /**
+     * Binding to the AI project.
+     */
+    ai: {
+        binding: string;
+    } | undefined;
     /**
      * "Unsafe" tables for features that aren't directly supported by wrangler.
      *
@@ -1345,16 +1396,6 @@ declare class FormData_2 {
  */
 declare type FormDataEntryValue = string | File_2
 
-/**
- *  fetches an mTLS certificate from the account mTLS certificate store by ID
- */
-export declare function getMTlsCertificate(accountId: string, id: string): Promise<MTlsCertificateResponse>;
-
-/**
- *  fetches an mTLS certificate from the account mTLS certificate store by name. will throw an error if no certificates are found, or multiple are found with that name
- */
-export declare function getMTlsCertificateByName(accountId: string, name: string): Promise<MTlsCertificateResponse>;
-
 declare class Headers_2 implements SpecIterable<[string, string]> {
     constructor (init?: HeadersInit_2)
     readonly append: (name: string, value: string) => void
@@ -1381,51 +1422,6 @@ declare type HeadersInit_2 = string[][] | Record<string, string | ReadonlyArray<
  */
 declare type IncomingHttpHeaders = Record<string, string | string[] | undefined>;
 
-/**
- *  lists mTLS certificates for an account. filtering by name is supported
- */
-export declare function listMTlsCertificates(accountId: string, filter: MTlsCertificateListFilter): Promise<MTlsCertificateResponse[]>;
-
-/**
- * details for uploading an mTLS certificate via the ssl api
- */
-declare interface MTlsCertificateBody {
-    certificateChain: string;
-    privateKey: string;
-    name?: string;
-}
-
-/**
- * supported filters for listing mTLS certificates via the ssl api
- */
-declare interface MTlsCertificateListFilter {
-    name?: string;
-}
-
-/**
- * the representation of an mTLS certificate in the account certificate store
- */
-declare interface MTlsCertificateResponse {
-    id: string;
-    name?: string;
-    ca: boolean;
-    certificates: string;
-    expires_on: string;
-    issuer: string;
-    serial_number: string;
-    signature: string;
-    uploaded_on: string;
-}
-
-/**
- * details for uploading an mTLS certificate from disk
- */
-declare interface MTlsCertificateUploadDetails {
-    certificateChainFilename: string;
-    privateKeyFilename: string;
-    name?: string;
-}
-
 declare interface PagesDeployOptions {
     /**
      * Path to static assets to deploy to Pages
@@ -1683,6 +1679,11 @@ export declare interface UnstableDevOptions {
         script_name?: string | undefined;
         environment?: string | undefined;
     }[];
+    services?: {
+        binding: string;
+        service: string;
+        environment?: string | undefined;
+    }[];
     r2?: {
         binding: string;
         bucket_name: string;
@@ -1718,15 +1719,10 @@ export declare interface UnstableDevWorker {
     waitUntilExit: () => Promise<void>;
 }
 
-/**
- *  uploads an mTLS certificate and private key pair to the account mTLS certificate store
- */
-export declare function uploadMTlsCertificate(accountId: string, body: MTlsCertificateBody): Promise<MTlsCertificateResponse>;
-
-/**
- * reads an mTLS certificate and private key pair from disk and uploads it to the account mTLS certificate store
- */
-export declare function uploadMTlsCertificateFromFs(accountId: string, details: MTlsCertificateUploadDetails): Promise<MTlsCertificateResponse>;
+declare interface UserLimits {
+    /** Maximum allowed CPU time for a worker's invocation in milliseconds */
+    cpu_ms: number;
+}
 
 declare type ZoneIdRoute = {
     pattern: string;