wrangler 2.8.0 → 2.9.0

package/src/__tests__/user.test.ts

@@ -45,7 +45,6 @@ describe("User", () => {
 					counter += 1;
 
 					return response.once(
-						context.status(200),
 						context.json({
 							access_token: "test-access-token",
 							expires_in: 100000,

package/src/__tests__/whoami.test.tsx

@@ -4,6 +4,7 @@ import { getUserInfo } from "../whoami";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { useMockIsTTY } from "./helpers/mock-istty";
 import {
+	createFetchResult,
 	msw,
 	mswSuccessOauthHandlers,
 	mswSuccessUserHandlers,
@@ -44,18 +45,14 @@ describe("getUserInfo()", () => {
 		msw.use(
 			rest.get("*/user", (_, res, ctx) => {
 				return res.once(
-					ctx.status(200),
-					ctx.json({
-						success: false,
-						errors: [
+					ctx.json(
+						createFetchResult({}, false, [
 							{
 								code: 9109,
 								message: "Uauthorized to access requested resource",
 							},
-						],
-						messages: [],
-						result: {},
-					})
+						])
+					)
 				);
 			}),
 			rest.get("*/accounts", (request, res, ctx) => {
@@ -71,15 +68,7 @@ describe("getUserInfo()", () => {
 			  "host": "api.cloudflare.com",
 			}
 		`);
-				return res.once(
-					ctx.status(200),
-					ctx.json({
-						success: true,
-						errors: [],
-						messages: [],
-						result: [],
-					})
-				);
+				return res.once(ctx.json(createFetchResult([])));
 			})
 		);
 		const userInfo = await getUserInfo();

package/src/__tests__/worker-namespace.test.ts

@@ -1,7 +1,11 @@
 import { rest } from "msw";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { msw, mswSuccessNamespacesHandlers } from "./helpers/msw";
+import {
+	createFetchResult,
+	msw,
+	mswSuccessNamespacesHandlers,
+} from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 
@@ -35,10 +39,11 @@ describe("dispatch-namespace", () => {
 		  wrangler dispatch-namespace rename <old-name> <new-name>  Rename a dispatch namespace
 
 		Flags:
-		  -c, --config   Path to .toml configuration file  [string]
-		  -e, --env      Environment to use for operations and .env files  [string]
-		  -h, --help     Show help  [boolean]
-		  -v, --version  Show version number  [boolean]",
+		  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+		  -c, --config                    Path to .toml configuration file  [string]
+		  -e, --env                       Environment to use for operations and .env files  [string]
+		  -h, --help                      Show help  [boolean]
+		  -v, --version                   Show version number  [boolean]",
 		  "warn": "",
 		}
 	`);
@@ -49,22 +54,23 @@ describe("dispatch-namespace", () => {
 		let counter = 0;
 		msw.use(
 			rest.post(
-				"/accounts/:accountId/workers/dispatch/namespaces/:namespaceNameParam",
-				(req, res, cxt) => {
+				"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceNameParam",
+				(req, res, ctx) => {
 					counter++;
 					const { namespaceNameParam } = req.params;
 					expect(counter).toBe(1);
 					expect(namespaceNameParam).toBe(namespaceName);
 					return res.once(
-						cxt.status(200),
-						cxt.json({
-							namespace_id: "some-namespace-id",
-							namespace_name: "namespace-name",
-							created_on: "2022-06-29T14:30:08.16152Z",
-							created_by: "1fc1df98cc4420fe00367c3ab68c1639",
-							modified_on: "2022-06-29T14:30:08.16152Z",
-							modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
-						})
+						ctx.json(
+							createFetchResult({
+								namespace_id: "some-namespace-id",
+								namespace_name: "namespace-name",
+								created_on: "2022-06-29T14:30:08.16152Z",
+								created_by: "1fc1df98cc4420fe00367c3ab68c1639",
+								modified_on: "2022-06-29T14:30:08.16152Z",
+								modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
+							})
+						)
 					);
 				}
 			)
@@ -87,10 +93,11 @@ describe("dispatch-namespace", () => {
 			  name  Name of the dispatch namespace  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 
@@ -108,13 +115,13 @@ describe("dispatch-namespace", () => {
 		let counter = 0;
 		msw.use(
 			rest.delete(
-				"/accounts/:accountId/workers/dispatch/namespaces/:namespaceNameParam",
-				(req, res, cxt) => {
+				"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceNameParam",
+				(req, res, ctx) => {
 					counter++;
 					const { namespaceNameParam } = req.params;
 					expect(counter).toBe(1);
 					expect(namespaceNameParam).toBe(namespaceName);
-					return res.once(cxt.status(200), cxt.json(null));
+					return res.once(ctx.json(null));
 				}
 			)
 		);
@@ -136,10 +143,11 @@ describe("dispatch-namespace", () => {
 			  name  Name of the dispatch namespace  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 
@@ -157,22 +165,23 @@ describe("dispatch-namespace", () => {
 		let counter = 0;
 		msw.use(
 			rest.get(
-				"/accounts/:accountId/workers/dispatch/namespaces/:namespaceNameParam",
-				(req, res, cxt) => {
+				"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceNameParam",
+				(req, res, ctx) => {
 					counter++;
 					const { namespaceNameParam } = req.params;
 					expect(counter).toBe(1);
 					expect(namespaceNameParam).toBe(namespaceName);
 					return res.once(
-						cxt.status(200),
-						cxt.json({
-							namespace_id: "some-namespace-id",
-							namespace_name: "namespace-name",
-							created_on: "2022-06-29T14:30:08.16152Z",
-							created_by: "1fc1df98cc4420fe00367c3ab68c1639",
-							modified_on: "2022-06-29T14:30:08.16152Z",
-							modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
-						})
+						ctx.json(
+							createFetchResult({
+								namespace_id: "some-namespace-id",
+								namespace_name: "namespace-name",
+								created_on: "2022-06-29T14:30:08.16152Z",
+								created_by: "1fc1df98cc4420fe00367c3ab68c1639",
+								modified_on: "2022-06-29T14:30:08.16152Z",
+								modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
+							})
+						)
 					);
 				}
 			)
@@ -195,10 +204,11 @@ describe("dispatch-namespace", () => {
 			  name  Name of the dispatch namespace  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 
@@ -223,22 +233,23 @@ describe("dispatch-namespace", () => {
 		let counter = 0;
 		msw.use(
 			rest.get(
-				"/accounts/:accountId/workers/dispatch/namespaces/:namespaceNameParam",
-				(req, res, cxt) => {
+				"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceNameParam",
+				(req, res, ctx) => {
 					counter++;
 					const { namespaceNameParam } = req.params;
 					expect(counter).toBe(1);
 					expect(namespaceNameParam).toBe(namespaceName);
 					return res.once(
-						cxt.status(200),
-						cxt.json({
-							namespace_id: "some-namespace-id",
-							namespace_name: "namespace-name",
-							created_on: "2022-06-29T14:30:08.16152Z",
-							created_by: "1fc1df98cc4420fe00367c3ab68c1639",
-							modified_on: "2022-06-29T14:30:08.16152Z",
-							modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
-						})
+						ctx.json(
+							createFetchResult({
+								namespace_id: "some-namespace-id",
+								namespace_name: "namespace-name",
+								created_on: "2022-06-29T14:30:08.16152Z",
+								created_by: "1fc1df98cc4420fe00367c3ab68c1639",
+								modified_on: "2022-06-29T14:30:08.16152Z",
+								modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
+							})
+						)
 					);
 				}
 			)
@@ -266,22 +277,23 @@ describe("dispatch-namespace", () => {
 		let counter = 0;
 		msw.use(
 			rest.put(
-				"/accounts/:accountId/workers/dispatch/namespaces/:namespaceNameParam",
-				(req, res, cxt) => {
+				"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceNameParam",
+				(req, res, ctx) => {
 					counter++;
 					const { namespaceNameParam } = req.params;
 					expect(counter).toBe(1);
 					expect(namespaceNameParam).toBe(namespaceName);
 					return res.once(
-						cxt.status(200),
-						cxt.json({
-							namespace_id: "some-namespace-id",
-							namespace_name: "namespace-name",
-							created_on: "2022-06-29T14:30:08.16152Z",
-							created_by: "1fc1df98cc4420fe00367c3ab68c1639",
-							modified_on: "2022-06-29T14:30:08.16152Z",
-							modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
-						})
+						ctx.json(
+							createFetchResult({
+								namespace_id: "some-namespace-id",
+								namespace_name: "namespace-name",
+								created_on: "2022-06-29T14:30:08.16152Z",
+								created_by: "1fc1df98cc4420fe00367c3ab68c1639",
+								modified_on: "2022-06-29T14:30:08.16152Z",
+								modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
+							})
+						)
 					);
 				}
 			)
@@ -305,10 +317,11 @@ describe("dispatch-namespace", () => {
 			  new-name  New name of the dispatch namespace  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 

package/src/api/dev.ts

@@ -100,7 +100,6 @@ export async function unstable_dev(
 		showInteractiveDevSession,
 		testMode,
 		testScheduled,
-		watch,
 		// 2. options for alpha/beta products/libs
 		d1Databases,
 		experimentalLocal,
@@ -139,20 +138,54 @@ export async function unstable_dev(
 					local: true,
 					d1Databases,
 					disableDevRegistry,
-					testScheduled,
-					experimentalLocal,
-					experimentalLocalRemoteKv,
+					testScheduled: testScheduled ?? false,
+					experimentalLocal: experimentalLocal ?? false,
+					experimentalLocalRemoteKv: experimentalLocalRemoteKv ?? false,
 					enablePagesAssetsServiceBinding,
 					liveReload,
 					showInteractiveDevSession,
 					forceLocal,
-					watch,
-					...options,
 					onReady: (address, port) => {
 						readyPort = port;
 						readyAddress = address;
 						ready(devServer);
 					},
+					config: options?.config,
+					env: options?.env,
+					bundle: options?.bundle,
+					compatibilityDate: options?.compatibilityDate,
+					compatibilityFlags: options?.compatibilityFlags,
+					ip: options?.ip,
+					inspectorPort: options?.inspectorPort,
+					v: undefined,
+					localProtocol: options?.localProtocol,
+					assets: options?.assets,
+					site: options?.site, // Root folder of static assets for Workers Sites
+					siteInclude: options?.siteInclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.
+					siteExclude: options?.siteExclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.
+					nodeCompat: options?.nodeCompat, // Enable node.js compatibility
+					persist: options?.persist, // Enable persistence for local mode, using default path: .wrangler/state
+					persistTo: options?.persistTo, // Specify directory to use for local persistence (implies --persist)
+					experimentalJsonConfig: undefined,
+					name: undefined,
+					noBundle: false,
+					format: undefined,
+					latest: false,
+					routes: undefined,
+					host: undefined,
+					localUpstream: undefined,
+					experimentalPublic: undefined,
+					upstreamProtocol: undefined,
+					var: undefined,
+					define: undefined,
+					jsxFactory: undefined,
+					jsxFragment: undefined,
+					tsconfig: undefined,
+					minify: undefined,
+					experimentalEnableLocalPersistence: undefined,
+					legacyEnv: undefined,
+					public: undefined,
+					...options,
 				});
 			}).then((devServer) => {
 				// now that the inner promise has resolved, we can resolve the outer promise
@@ -190,22 +223,58 @@ export async function unstable_dev(
 					inspect: false,
 					_: [],
 					$0: "",
+					logLevel: options?.logLevel ?? "log",
+					port: options?.port ?? 0,
 					local: true,
 					showInteractiveDevSession,
 					d1Databases,
 					disableDevRegistry,
-					testScheduled,
-					experimentalLocal,
-					experimentalLocalRemoteKv,
+					testScheduled: testScheduled ?? false,
+					experimentalLocal: experimentalLocal ?? false,
+					experimentalLocalRemoteKv: experimentalLocalRemoteKv ?? false,
 					enablePagesAssetsServiceBinding,
 					liveReload,
-					watch,
-					...options,
 					onReady: (address, port) => {
 						readyPort = port;
 						readyAddress = address;
 						ready(devServer);
 					},
+					config: options?.config,
+					env: options?.env,
+					bundle: options?.bundle,
+					compatibilityDate: options?.compatibilityDate,
+					compatibilityFlags: options?.compatibilityFlags,
+					ip: options?.ip,
+					inspectorPort: options?.inspectorPort,
+					v: undefined,
+					localProtocol: options?.localProtocol,
+					assets: options?.assets,
+					site: options?.site, // Root folder of static assets for Workers Sites
+					siteInclude: options?.siteInclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.
+					siteExclude: options?.siteExclude, // Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.
+					nodeCompat: options?.nodeCompat, // Enable node.js compatibility
+					persist: options?.persist, // Enable persistence for local mode, using default path: .wrangler/state
+					persistTo: options?.persistTo, // Specify directory to use for local persistence (implies --persist)
+					experimentalJsonConfig: undefined,
+					name: undefined,
+					noBundle: false,
+					format: undefined,
+					latest: false,
+					routes: undefined,
+					host: undefined,
+					localUpstream: undefined,
+					experimentalPublic: undefined,
+					upstreamProtocol: undefined,
+					var: undefined,
+					define: undefined,
+					jsxFactory: undefined,
+					jsxFragment: undefined,
+					tsconfig: undefined,
+					minify: undefined,
+					experimentalEnableLocalPersistence: undefined,
+					legacyEnv: undefined,
+					public: undefined,
+					...options,
 				});
 			}).then((devServer) => {
 				resolve({

package/src/api/index.ts

@@ -1,2 +1,3 @@
 export { unstable_dev } from "./dev";
 export type { UnstableDevWorker, UnstableDevOptions } from "./dev";
+export { unstable_pages } from "./pages";

package/src/api/pages/index.ts

@@ -0,0 +1,5 @@
+import { publish } from "./publish";
+
+export const unstable_pages = {
+	publish,
+};