Only enable hotkeys after authenticating if hotkeys were previously e…

…nabled (#7064)

.changeset/smooth-kiwis-clean.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Fix `wrangler dev --remote --show-interactive-dev-session=false` by only enabling hotkeys after account selection if hotkeys were previously enabled

packages/wrangler/e2e/__snapshots__/dev.test.ts.snap

@@ -4,14 +4,22 @@ exports[`basic js dev: 'wrangler dev --no-x-dev-env' > can modify worker during
 
 exports[`basic js dev: 'wrangler dev --no-x-dev-env' > can modify worker during wrangler dev --no-x-dev-env 2`] = `"Updated Worker! value"`;
 
+exports[`basic js dev: 'wrangler dev --no-x-dev-env' > hotkeys can be disabled with wrangler dev --no-x-dev-env 1`] = `"Hello World!"`;
+
 exports[`basic js dev: 'wrangler dev --remote --no-x-dev-env' > can modify worker during wrangler dev --remote --no-x-dev-env 1`] = `"Hello World!"`;
 
 exports[`basic js dev: 'wrangler dev --remote --no-x-dev-env' > can modify worker during wrangler dev --remote --no-x-dev-env 2`] = `"Updated Worker! value"`;
 
+exports[`basic js dev: 'wrangler dev --remote --no-x-dev-env' > hotkeys can be disabled with wrangler dev --remote --no-x-dev-env 1`] = `"Hello World!"`;
+
 exports[`basic js dev: 'wrangler dev --remote --x-dev-env' > can modify worker during wrangler dev --remote --x-dev-env 1`] = `"Hello World!"`;
 
 exports[`basic js dev: 'wrangler dev --remote --x-dev-env' > can modify worker during wrangler dev --remote --x-dev-env 2`] = `"Updated Worker! value"`;
 
+exports[`basic js dev: 'wrangler dev --remote --x-dev-env' > hotkeys can be disabled with wrangler dev --remote --x-dev-env 1`] = `"Hello World!"`;
+
 exports[`basic js dev: 'wrangler dev --x-dev-env' > can modify worker during wrangler dev --x-dev-env 1`] = `"Hello World!"`;
 
 exports[`basic js dev: 'wrangler dev --x-dev-env' > can modify worker during wrangler dev --x-dev-env 2`] = `"Updated Worker! value"`;
+
+exports[`basic js dev: 'wrangler dev --x-dev-env' > hotkeys can be disabled with wrangler dev --x-dev-env 1`] = `"Hello World!"`;

packages/wrangler/e2e/dev.test.ts

@@ -102,6 +102,43 @@ describe.each([
 
 		await expect(fetchText(url)).resolves.toMatchSnapshot();
 	});
+
+	it(`hotkeys can be disabled with ${cmd}`, async () => {
+		const helper = new WranglerE2ETestHelper();
+		await helper.seed({
+			"wrangler.toml": dedent`
+							name = "${workerName}"
+							main = "src/index.ts"
+							compatibility_date = "2023-01-01"
+							compatibility_flags = ["nodejs_compat"]
+
+							[vars]
+							KEY = "value"
+					`,
+			"src/index.ts": dedent`
+							export default {
+								fetch(request) {
+									return new Response("Hello World!")
+								}
+							}`,
+			"package.json": dedent`
+							{
+								"name": "worker",
+								"version": "0.0.0",
+								"private": true
+							}
+							`,
+		});
+		const worker = helper.runLongLived(
+			`${cmd} --show-interactive-dev-session=false`
+		);
+
+		const { url } = await worker.waitForReady();
+
+		await expect(fetch(url).then((r) => r.text())).resolves.toMatchSnapshot();
+
+		await expect(worker.currentOutput).not.toContain("[b] open a browser");
+	});
 });
 
 // Skipping remote python tests because they consistently flake with timeouts

packages/wrangler/src/dev.tsx

@@ -711,11 +711,14 @@ export async function startDev(args: StartDevOptions) {
 					},
 					dev: {
 						auth: async (config) => {
+							const hotkeysDisplayed = !!unregisterHotKeys;
 							let accountId = args.accountId;
 							if (!accountId) {
 								unregisterHotKeys?.();
 								accountId = await requireAuth(config);
-								unregisterHotKeys = registerDevHotKeys(devEnv, args);
+								if (hotkeysDisplayed) {
+									unregisterHotKeys = registerDevHotKeys(devEnv, args);
+								}
 							}
 							return {
 								accountId,