wrangler 0.0.28 → 0.0.29

package/README.md

@@ -2,24 +2,29 @@
 
 `wrangler` is a command line tool for building [Cloudflare Workers](https://workers.cloudflare.com/).
 
-[(Read the full stack week launch blog post.)](https://blog.cloudflare.com/wrangler-v2-beta/)
-
-**DISCLAIMER**: This is a work in progress, and is NOT recommended for use in production. We are opening this preview for feedback from the community, and to openly share our [roadmap](https://github.com/cloudflare/wrangler2/milestones) for the future. As such, expect APIs and documentation to change before the end of the preview.
-
-Further, we will NOT do a general release until we are both feature complete, and have a full backward compatibility and incremental migration plan in place. For more details, follow the [2.0 milestone](https://github.com/cloudflare/wrangler2/milestone/1).
-
 ## Quick Start
 
 ```bash
 # Make a javascript file
-$ echo "export default { fetch() { return new Response('hello world') } }" > index.js
+echo "export default { fetch() { return new Response('hello world') } }" > index.js
 # try it out
-$ npx wrangler dev index.js
+npx wrangler dev index.js
 # and then publish it
-$ npx wrangler publish index.js --name my-worker
+npx wrangler publish index.js --name my-worker
 # visit https://my-worker.<your workers subdomain>.workers.dev
 ```
 
+## Create a Project
+
+```bash
+# Generate a new project
+npx wrangler init my-worker
+# try it out
+cd my-worker && npm run start
+# and then publish it
+npx wrangler publish
+```
+
 ## Installation:
 
 ```bash
@@ -30,18 +35,20 @@ $ npm install wrangler --save-dev
 
 ### `wrangler init [name]`
 
-Creates a `wrangler.toml` configuration file. For more details on the configuration keys and values, refer to the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/configuration).
+Creates a Worker project. For details on configuration keys and values, refer to the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/configuration).
 
-### `wrangler dev [script]`
+### `wrangler dev`
 
 Start a local development server, with live reloading and devtools.
 
-### `wrangler publish [script] --name [name]`
+### `wrangler publish`
 
 Publish the given script to the worldwide Cloudflare network.
 
 For more commands and options, refer to the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/commands).
 
+## Pages
+
 ### `wrangler pages dev [directory] [-- command]`
 
 Either serves a static build asset directory, or proxies itself in front of a command.
@@ -49,3 +56,7 @@ Either serves a static build asset directory, or proxies itself in front of a co
 Builds and runs functions from a `./functions` directory or uses a `_worker.js` file inside the static build asset directory.
 
 For more commands and options, refer to the [documentation](https://developers.cloudflare.com/pages/platform/functions#develop-and-preview-locally) or run `wrangler pages dev --help`.
+
+## Documentation
+
+For the latest Wrangler documentation, [click here](https://6b05b6e1.cloudflare-docs-7ou.pages.dev/workers/wrangler/).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {
@@ -69,6 +69,7 @@
     "cmd-shim": "^4.1.0",
     "command-exists": "^1.2.9",
     "devtools-protocol": "^0.0.955664",
+    "dotenv": "^16.0.0",
     "execa": "^6.1.0",
     "faye-websocket": "^0.11.4",
     "finalhandler": "^1.2.0",
@@ -95,6 +96,7 @@
     "supports-color": "^9.2.2",
     "timeago.js": "^4.0.2",
     "tmp-promise": "^3.0.3",
+    "ts-dedent": "^2.2.0",
     "undici": "^4.15.1",
     "update-check": "^1.5.4",
     "ws": "^8.5.0",

package/pages/functions/template-plugin.ts

@@ -132,7 +132,7 @@ export default function (pluginArgs) {
         // https://fetch.spec.whatwg.org/#null-body-status
         return new Response(
           [101, 204, 205, 304].includes(response.status) ? null : response.body,
-          response
+          { ...response, headers: new Headers(response.headers) }
         );
       } else {
         return next();

package/pages/functions/template-worker.ts

@@ -123,7 +123,7 @@ export default {
         // https://fetch.spec.whatwg.org/#null-body-status
         return new Response(
           [101, 204, 205, 304].includes(response.status) ? null : response.body,
-          { ...response, headers: new Headers([...response.headers.entries()]) }
+          { ...response, headers: new Headers(response.headers) }
         );
       } else if (__FALLBACK_SERVICE__) {
         // There are no more handlers so finish with the fallback service (`env.ASSETS.fetch` in Pages' case)

package/src/__tests__/config-cache.test.ts

@@ -0,0 +1,36 @@
+import { getConfigCache, saveToConfigCache } from "../config-cache";
+import { runInTempDir } from "./helpers/run-in-tmp";
+
+interface PagesConfigCache {
+  account_id: string;
+  pages_project_name: string;
+}
+
+describe("config cache", () => {
+  runInTempDir();
+
+  const pagesConfigCacheFilename = "pages-config-cache.json";
+
+  it("should return an empty config if no file exists", () => {
+    expect(
+      getConfigCache<PagesConfigCache>(pagesConfigCacheFilename)
+    ).toMatchInlineSnapshot(`Object {}`);
+  });
+
+  it("should read and write values without overriding old ones", () => {
+    saveToConfigCache<PagesConfigCache>(pagesConfigCacheFilename, {
+      account_id: "some-account-id",
+      pages_project_name: "foo",
+    });
+    expect(
+      getConfigCache<PagesConfigCache>(pagesConfigCacheFilename).account_id
+    ).toEqual("some-account-id");
+
+    saveToConfigCache<PagesConfigCache>(pagesConfigCacheFilename, {
+      pages_project_name: "bar",
+    });
+    expect(
+      getConfigCache<PagesConfigCache>(pagesConfigCacheFilename).account_id
+    ).toEqual("some-account-id");
+  });
+});

package/src/__tests__/configuration.test.ts

@@ -157,7 +157,7 @@ describe("normalizeAndValidateConfig()", () => {
       expect(diagnostics.hasErrors()).toBe(false);
       expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
         "Processing wrangler configuration:
-          - 😶 UNUSED: \\"miniflare\\":
+          - 😶 Ignored: \\"miniflare\\":
             Wrangler does not use configuration in the \`miniflare\` section. Unless you are using Miniflare directly you can remove this section."
       `);
     });
@@ -250,7 +250,7 @@ describe("normalizeAndValidateConfig()", () => {
         expect(normalizeSlashes(diagnostics.renderWarnings()))
           .toMatchInlineSnapshot(`
           "Processing wrangler configuration:
-            - DEPRECATION: \\"site.entry-point\\":
+            - Deprecation: \\"site.entry-point\\":
               Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration file:
               \`\`\`
               main = \\"my-site/index.js\\"
@@ -281,7 +281,7 @@ describe("normalizeAndValidateConfig()", () => {
         expect(normalizeSlashes(diagnostics.renderWarnings()))
           .toMatchInlineSnapshot(`
           "Processing wrangler configuration:
-            - DEPRECATION: \\"site.entry-point\\":
+            - Deprecation: \\"site.entry-point\\":
               Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration file:
               \`\`\`
               main = \\"workers-site/index.js\\"
@@ -324,7 +324,7 @@ describe("normalizeAndValidateConfig()", () => {
         expect(normalizeSlashes(diagnostics.renderWarnings()))
           .toMatchInlineSnapshot(`
           "Processing wrangler configuration:
-            - DEPRECATION: \\"site.entry-point\\":
+            - Deprecation: \\"site.entry-point\\":
               Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration file:
               \`\`\`
               main = \\"111/index.js\\"
@@ -358,7 +358,7 @@ describe("normalizeAndValidateConfig()", () => {
         expect(normalizeSlashes(diagnostics.renderWarnings()))
           .toMatchInlineSnapshot(`
           "Processing wrangler configuration:
-            - DEPRECATION: \\"site.entry-point\\":
+            - Deprecation: \\"site.entry-point\\":
               Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration file:
               \`\`\`
               main = \\"some/other/script.js\\"
@@ -571,10 +571,10 @@ describe("normalizeAndValidateConfig()", () => {
         expect(diagnostics.hasWarnings()).toBe(true);
         expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
           "Processing wrangler configuration:
-            - DEPRECATION: \\"type\\":
-              DO NOT USE THIS. Most common features now work out of the box with wrangler, including modules, jsx, typescript, etc. If you need anything more, use a custom build.
-            - DEPRECATION: \\"webpack_config\\":
-              DO NOT USE THIS. Most common features now work out of the box with wrangler, including modules, jsx, typescript, etc. If you need anything more, use a custom build."
+            - 😶 Ignored: \\"type\\":
+              Most common features now work out of the box with wrangler, including modules, jsx, typescript, etc. If you need anything more, use a custom build.
+            - 😶 Ignored: \\"webpack_config\\":
+              Most common features now work out of the box with wrangler, including modules, jsx, typescript, etc. If you need anything more, use a custom build."
         `);
       });
     });
@@ -869,17 +869,17 @@ describe("normalizeAndValidateConfig()", () => {
       expect(normalizePath(diagnostics.renderWarnings()))
         .toMatchInlineSnapshot(`
         "Processing project/wrangler.toml configuration:
-          - DEPRECATION: \\"build.upload.format\\":
+          - Deprecation: \\"build.upload.format\\":
             The format is inferred automatically from the code.
-          - DEPRECATION: \\"build.upload.main\\":
+          - Deprecation: \\"build.upload.main\\":
             Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
             Then add the top level \`main\` field to your configuration file:
             \`\`\`
             main = \\"src/index.ts\\"
             \`\`\`
-          - DEPRECATION: \\"build.upload.dir\\":
+          - Deprecation: \\"build.upload.dir\\":
             Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the Worker.
-          - DEPRECATION: The \`build.upload.rules\` config field is no longer used, the rules should be specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration file, and add this:
+          - Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration file, and add this:
             \`\`\`
             [[rules]]
             type = \\"Text\\"
@@ -1619,9 +1619,9 @@ describe("normalizeAndValidateConfig()", () => {
         expect(diagnostics.hasWarnings()).toBe(true);
         expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
           "Processing wrangler configuration:
-            - DEPRECATION: \\"zone_id\\":
+            - Deprecation: \\"zone_id\\":
               This is unnecessary since we can deduce this from routes directly.
-            - DEPRECATION: \\"experimental_services\\":
+            - Deprecation: \\"experimental_services\\":
               The \\"experimental_services\\" field is no longer supported. Instead, use [[unsafe.bindings]] to enable experimental features. Add this to your wrangler.toml:
               \`\`\`
               [[unsafe.bindings]]
@@ -1815,7 +1815,11 @@ describe("normalizeAndValidateConfig()", () => {
 
         expect(config.name).toEqual("mock-name");
         expect(diagnostics.hasErrors()).toBe(false);
-        expect(diagnostics.hasWarnings()).toBe(false);
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in the future. DO NOT USE IN PRODUCTION."
+        `);
       });
 
       it("should error if named environment contains a `name` field, even if there is no top-level name", () => {
@@ -1835,6 +1839,12 @@ describe("normalizeAndValidateConfig()", () => {
         );
 
         expect(config.name).toBeUndefined();
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in the future. DO NOT USE IN PRODUCTION."
+        `);
         expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
           "Processing wrangler configuration:
 
@@ -1842,7 +1852,6 @@ describe("normalizeAndValidateConfig()", () => {
               - The \\"name\\" field is not allowed in named service environments.
                 Please remove the field from this environment."
         `);
-        expect(diagnostics.hasWarnings()).toBe(false);
       });
 
       it("should error if top-level config and a named environment both contain a `name` field", () => {
@@ -1863,6 +1872,12 @@ describe("normalizeAndValidateConfig()", () => {
         );
 
         expect(config.name).toEqual("mock-name");
+        expect(diagnostics.hasWarnings()).toBe(true);
+        expect(diagnostics.hasErrors()).toBe(true);
+        expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+          "Processing wrangler configuration:
+            - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in the future. DO NOT USE IN PRODUCTION."
+        `);
         expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
           "Processing wrangler configuration:
 
@@ -1870,7 +1885,6 @@ describe("normalizeAndValidateConfig()", () => {
               - The \\"name\\" field is not allowed in named service environments.
                 Please remove the field from this environment."
         `);
-        expect(diagnostics.hasWarnings()).toBe(false);
       });
     });
 
@@ -1890,7 +1904,12 @@ describe("normalizeAndValidateConfig()", () => {
         { env: "DEV" }
       );
 
+      expect(diagnostics.hasWarnings()).toBe(true);
       expect(config.account_id).toBeUndefined();
+      expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+        "Processing wrangler configuration:
+          - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in the future. DO NOT USE IN PRODUCTION."
+      `);
       expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
         "Processing wrangler configuration:
 
@@ -1898,7 +1917,6 @@ describe("normalizeAndValidateConfig()", () => {
             - The \\"account_id\\" field is not allowed in named service environments.
               Please remove the field from this environment."
       `);
-      expect(diagnostics.hasWarnings()).toBe(false);
     });
 
     it("should error if top-level config and a named environment both contain a `account_id` field", () => {
@@ -1919,6 +1937,12 @@ describe("normalizeAndValidateConfig()", () => {
       );
 
       expect(config.account_id).toEqual("ACCOUNT_ID");
+      expect(diagnostics.hasErrors()).toBe(true);
+      expect(diagnostics.hasWarnings()).toBe(true);
+      expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+        "Processing wrangler configuration:
+          - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in the future. DO NOT USE IN PRODUCTION."
+      `);
       expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
         "Processing wrangler configuration:
 
@@ -1926,7 +1950,6 @@ describe("normalizeAndValidateConfig()", () => {
             - The \\"account_id\\" field is not allowed in named service environments.
               Please remove the field from this environment."
       `);
-      expect(diagnostics.hasWarnings()).toBe(false);
     });
 
     it("should warn for non-inherited fields that are missing in environments", () => {
@@ -2843,9 +2866,9 @@ describe("normalizeAndValidateConfig()", () => {
           "Processing wrangler configuration:
 
             - \\"env.ENV1\\" environment configuration
-              - DEPRECATION: \\"zone_id\\":
+              - Deprecation: \\"zone_id\\":
                 This is unnecessary since we can deduce this from routes directly.
-              - DEPRECATION: \\"experimental_services\\":
+              - Deprecation: \\"experimental_services\\":
                 The \\"experimental_services\\" field is no longer supported. Instead, use [[unsafe.bindings]] to enable experimental features. Add this to your wrangler.toml:
                 \`\`\`
                 [[unsafe.bindings]]

package/src/__tests__/dev.test.tsx

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
-import { readFileSync } from "node:fs";
 import patchConsole from "patch-console";
+import dedent from "ts-dedent";
 import Dev from "../dev/dev";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
@@ -40,16 +40,17 @@ describe("wrangler dev", () => {
       expect(std.out).toMatchInlineSnapshot(`""`);
       expect(std.warn.replaceAll(currentDate, "<current-date>"))
         .toMatchInlineSnapshot(`
-        "▲ [WARNING] No compatibility_date was specified. Using today's date: <current-date>.
-        Add one to your wrangler.toml file:
-        \`\`\`
-        compatibility_date = \\"<current-date>\\"
-        \`\`\`
-        or pass it in your terminal:
-        \`\`\`
-        --compatibility-date=<current-date>
-        \`\`\`
-        See https://developers.cloudflare.com/workers/platform/compatibility-dates for more information.
+        "▲ [WARNING] No compatibility_date was specified. Using today's date: <current-date>.
+
+          Add one to your wrangler.toml file:
+          \`\`\`
+          compatibility_date = \\"<current-date>\\"
+          \`\`\`
+          or pass it in your terminal:
+          \`\`\`
+          --compatibility-date=<current-date>
+          \`\`\`
+          See https://developers.cloudflare.com/workers/platform/compatibility-dates for more information.
 
         "
       `);
@@ -382,7 +383,7 @@ describe("wrangler dev", () => {
 
       await runWrangler("dev index.js");
 
-      expect(readFileSync("index.js", "utf-8")).toMatchInlineSnapshot(
+      expect(fs.readFileSync("index.js", "utf-8")).toMatchInlineSnapshot(
         `"export default { fetch(){ return new Response(123) } }"`
       );
 
@@ -410,7 +411,7 @@ describe("wrangler dev", () => {
 
         await runWrangler("dev index.js");
 
-        expect(readFileSync("index.js", "utf-8")).toMatchInlineSnapshot(`
+        expect(fs.readFileSync("index.js", "utf-8")).toMatchInlineSnapshot(`
           "export default { fetch(){ return new Response(123) } }
           "
         `);
@@ -476,9 +477,10 @@ describe("wrangler dev", () => {
       );
       expect(std.out).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`
-        "▲ [WARNING] Setting upstream-protocol to http is not currently implemented.
-        If this is required in your project, please add your use case to the following issue:
-        https://github.com/cloudflare/wrangler2/issues/583.
+        "▲ [WARNING] Setting upstream-protocol to http is not currently implemented.
+
+          If this is required in your project, please add your use case to the following issue:
+          https://github.com/cloudflare/wrangler2/issues/583.
 
         "
       `);
@@ -604,17 +606,68 @@ describe("wrangler dev", () => {
       expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("localhost");
       expect(std.out).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`
-        "▲ [WARNING] WARNING: You have Durable Object bindings that are not defined locally in the worker being developed.
-        Be aware that changes to the data stored in these Durable Objects will be permanent and affect the live instances.
-        Remote Durable Objects that are affected:
-        - {\\"name\\":\\"NAME_2\\",\\"class_name\\":\\"CLASS_2\\",\\"script_name\\":\\"SCRIPT_A\\"}
-        - {\\"name\\":\\"NAME_4\\",\\"class_name\\":\\"CLASS_4\\",\\"script_name\\":\\"SCRIPT_B\\"}
+        "▲ [WARNING] WARNING: You have Durable Object bindings that are not defined locally in the worker being developed.
+
+          Be aware that changes to the data stored in these Durable Objects will be permanent and affect the
+          live instances.
+          Remote Durable Objects that are affected:
+          - {\\"name\\":\\"NAME_2\\",\\"class_name\\":\\"CLASS_2\\",\\"script_name\\":\\"SCRIPT_A\\"}
+          - {\\"name\\":\\"NAME_4\\",\\"class_name\\":\\"CLASS_4\\",\\"script_name\\":\\"SCRIPT_B\\"}
 
         "
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
   });
+
+  describe(".dev.vars", () => {
+    it("should override `vars` bindings from `wrangler.toml` with values in `.dev.vars`", async () => {
+      fs.writeFileSync("index.js", `export default {};`);
+
+      const localVarsEnvContent = dedent`
+      # Preceding comment
+      VAR_1="var #1 value" # End of line comment
+      VAR_3="var #3 value"
+      VAR_MULTI_LINE_1="A: line 1
+      line 2"
+      VAR_MULTI_LINE_2="B: line 1\\nline 2"
+      EMPTY=
+      UNQUOTED= unquoted value
+      `;
+      fs.writeFileSync(".dev.vars", localVarsEnvContent, "utf8");
+
+      writeWranglerToml({
+        main: "index.js",
+        vars: {
+          VAR_1: "original value 1",
+          VAR_2: "original value 2", // should not get overridden
+          VAR_3: "original value 3",
+          VAR_MULTI_LINE_1: "original multi-line 1",
+          VAR_MULTI_LINE_2: "original multi-line 2",
+          EMPTY: "original empty",
+          UNQUOTED: "original unquoted",
+        },
+      });
+      await runWrangler("dev");
+      const varBindings: Record<string, unknown> = (Dev as jest.Mock).mock
+        .calls[0][0].bindings.vars;
+
+      expect(varBindings).toEqual({
+        VAR_1: "var #1 value",
+        VAR_2: "original value 2",
+        VAR_3: "var #3 value",
+        VAR_MULTI_LINE_1: "A: line 1\nline 2",
+        VAR_MULTI_LINE_2: "B: line 1\nline 2",
+        EMPTY: "",
+        UNQUOTED: "unquoted value", // Note that whitespace is trimmed
+      });
+      expect(std.out).toMatchInlineSnapshot(
+        `"Using vars defined in .dev.vars"`
+      );
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+  });
 });
 
 function mockGetZones(domain: string, zones: { id: string }[] = []) {

package/src/__tests__/helpers/mock-console.ts

@@ -1,4 +1,5 @@
 import * as util from "node:util";
+import { logger } from "../../logger";
 
 /**
  * We use this module to mock console methods, and optionally
@@ -39,6 +40,7 @@ function captureCalls(spy: jest.SpyInstance): string {
 
 export function mockConsoleMethods() {
   beforeEach(() => {
+    logger.columns = 100;
     debugSpy = jest.spyOn(console, "debug").mockImplementation();
     logSpy = jest.spyOn(console, "log").mockImplementation();
     errorSpy = jest.spyOn(console, "error").mockImplementation();

package/src/__tests__/helpers/mock-istty.ts

@@ -1,4 +1,5 @@
-const ORIGINAL_ISTTY = process.stdout.isTTY;
+const ORIGINAL_STDOUT_ISTTY = process.stdout.isTTY;
+const ORIGINAL_STDIN_ISTTY = process.stdin.isTTY;
 
 /**
  * Mock `process.stdout.isTTY`
@@ -9,14 +10,17 @@ export function useMockIsTTY() {
    */
   const setIsTTY = (isTTY: boolean) => {
     process.stdout.isTTY = isTTY;
+    process.stdin.isTTY = isTTY;
   };
 
   beforeEach(() => {
-    process.stdout.isTTY = ORIGINAL_ISTTY;
+    process.stdout.isTTY = ORIGINAL_STDOUT_ISTTY;
+    process.stdin.isTTY = ORIGINAL_STDIN_ISTTY;
   });
 
   afterEach(() => {
-    process.stdout.isTTY = ORIGINAL_ISTTY;
+    process.stdout.isTTY = ORIGINAL_STDOUT_ISTTY;
+    process.stdin.isTTY = ORIGINAL_STDIN_ISTTY;
   });
 
   return { setIsTTY };

package/src/__tests__/helpers/mock-oauth-flow.ts

@@ -1,5 +1,6 @@
 import fetchMock from "jest-fetch-mock";
 import { Request } from "undici";
+import { getCloudflareApiBaseUrl } from "../../cfetch";
 import openInBrowser from "../../open-in-browser";
 import { mockHttpServer } from "./mock-http-server";
 
@@ -85,6 +86,28 @@ export const mockOAuthFlow = () => {
     return outcome;
   };
 
+  const mockGetMemberships = (args: {
+    success: boolean;
+    result: { id: string; account: { id: string; name: string } }[];
+  }) => {
+    const outcome = {
+      actual: new Request("https://example.org"),
+      expected: new Request(`${getCloudflareApiBaseUrl()}/memberships`, {
+        method: "GET",
+      }),
+    };
+
+    fetchMock.mockIf(outcome.expected.url, async (req) => {
+      outcome.actual = req;
+      return {
+        status: 200,
+        body: JSON.stringify(args),
+      };
+    });
+
+    return outcome;
+  };
+
   const mockGrantAccessToken = ({
     respondWith,
   }: {
@@ -150,10 +173,11 @@ export const mockOAuthFlow = () => {
   };
 
   return {
-    mockOAuthServerCallback,
+    mockGetMemberships,
+    mockGrantAccessToken,
     mockGrantAuthorization,
+    mockOAuthServerCallback,
     mockRevokeAuthorization,
-    mockGrantAccessToken,
     mockExchangeRefreshTokenForAccessToken,
   };
 };

package/src/__tests__/https-options.test.ts

@@ -97,8 +97,9 @@ describe("getHttpsOptions()", () => {
       `"Generating new self-signed certificate..."`
     );
     expect(std.warn).toMatchInlineSnapshot(`
-      "▲ [WARNING] Unable to cache generated self-signed certificate in home/.wrangler/local-cert.
-      ERROR: Cannot write file
+      "▲ [WARNING] Unable to cache generated self-signed certificate in home/.wrangler/local-cert.
+
+        ERROR: Cannot write file
 
       "
     `);

package/src/__tests__/index.test.ts

@@ -97,14 +97,14 @@ describe("wrangler", () => {
     it("should throw an error if the deprecated command is used with positional arguments", async () => {
       await expect(runWrangler("preview GET")).rejects
         .toThrowErrorMatchingInlineSnapshot(`
-              "DEPRECATION:
+              "Deprecation:
               The \`wrangler preview\` command has been deprecated.
               Try using \`wrangler dev\` to to try out a worker during development.
               "
             `);
       await expect(runWrangler(`preview GET "SomeBody"`)).rejects
         .toThrowErrorMatchingInlineSnapshot(`
-              "DEPRECATION:
+              "Deprecation:
               The \`wrangler preview\` command has been deprecated.
               Try using \`wrangler dev\` to to try out a worker during development.
               "
@@ -222,7 +222,7 @@ describe("wrangler", () => {
     it("should print a deprecation message for 'generate'", async () => {
       await runWrangler("generate").catch((err) => {
         expect(err.message).toMatchInlineSnapshot(`
-          "DEPRECATION:
+          "Deprecation:
           \`wrangler generate\` has been deprecated, please refer to https://github.com/cloudflare/wrangler2/blob/main/docs/deprecations.md#generate for alternatives"
         `);
       });
@@ -230,7 +230,7 @@ describe("wrangler", () => {
     it("should print a deprecation message for 'build'", async () => {
       await runWrangler("build").catch((err) => {
         expect(err.message).toMatchInlineSnapshot(`
-          "DEPRECATION:
+          "Deprecation:
           \`wrangler build\` has been deprecated, please refer to https://github.com/cloudflare/wrangler2/blob/main/docs/deprecations.md#build for alternatives"
         `);
       });

package/src/__tests__/kv.test.ts

@@ -291,8 +291,9 @@ describe("wrangler", () => {
                 --namespace-id  The id of the namespace to delete  [string]
             -e, --env           Perform on a specific environment  [string]
                 --preview       Interact with a preview namespace  [boolean]
-          X [ERROR] Not able to delete namespace.
-          A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
+          X [ERROR] Not able to delete namespace.
+
+            A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
 
           "
         `);
@@ -1229,8 +1230,9 @@ describe("wrangler", () => {
           If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
         `);
         expect(std.warn).toMatchInlineSnapshot(`
-          "▲ [WARNING] Unexpected key-value properties in \\"keys.json\\".
-          The item at index 4 contains unexpected properties: [\\"invalid\\"].
+          "▲ [WARNING] Unexpected key-value properties in \\"keys.json\\".
+
+            The item at index 4 contains unexpected properties: [\\"invalid\\"].
 
           "
         `);