fix: Only show keyboard shortcut to reopen browser when it's usable

wxt-dev · Dec 8, 2024 · c249d58 · c249d58
1 parent 0fd5c38
commit c249d58
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/packages/wxt/src/core/create-server.ts b/packages/wxt/src/core/create-server.ts
@@ -99,7 +99,7 @@ async function createServerInternal(): Promise<WxtDevServer> {
 
       // Register content scripts for the first time after the background starts
       // up since they're not listed in the manifest.
-      // Add listener before opening the browser to guarentee it is present when
+      // Add listener before opening the browser to guarantee it is present when
       // the extension sends back the initialization message.
       server.ws.on('wxt:background-initialized', () => {
         if (server.currentOutput == null) return;
@@ -112,7 +112,10 @@ async function createServerInternal(): Promise<WxtDevServer> {
       const reloadOnChange = createFileReloader(server);
       server.watcher.on('all', reloadOnChange);
       keyboardShortcuts.start();
-      keyboardShortcuts.printHelp();
+      keyboardShortcuts.printHelp({
+        canReopenBrowser:
+          !wxt.config.runnerConfig.config.disabled && !!runner.canOpen?.(),
+      });
     },
 
     async stop() {

diff --git a/packages/wxt/src/core/keyboard-shortcuts.ts b/packages/wxt/src/core/keyboard-shortcuts.ts
@@ -6,7 +6,7 @@ import pc from 'picocolors';
 export interface KeyboardShortcutWatcher {
   start(): void;
   stop(): void;
-  printHelp(): void;
+  printHelp(flags: { canReopenBrowser: boolean }): void;
 }
 
 /**
@@ -49,8 +49,8 @@ export function createKeyboardShortcuts(
       isWatching = false;
     },
 
-    printHelp() {
-      if (!wxt.config.runnerConfig.config.disabled) {
+    printHelp(flags) {
+      if (flags.canReopenBrowser) {
         wxt.logger.info(
           `${pc.dim('Press')} ${pc.bold('o + enter')} ${pc.dim('to reopen the browser')}`,
         );

diff --git a/packages/wxt/src/core/runners/web-ext.ts b/packages/wxt/src/core/runners/web-ext.ts
@@ -11,6 +11,9 @@ export function createWebExtRunner(): ExtensionRunner {
   let runner: WebExtRunInstance | undefined;
 
   return {
+    canOpen() {
+      return true;
+    },
     async openBrowser() {
       const startTime = Date.now();
 

diff --git a/packages/wxt/src/types.ts b/packages/wxt/src/types.ts
@@ -1411,6 +1411,8 @@ export interface FsCache {
 export interface ExtensionRunner {
   openBrowser(): Promise<void>;
   closeBrowser(): Promise<void>;
+  /** Whether or not this runner actually opens the browser. */
+  canOpen?(): boolean;
 }
 
 export type EslintGlobalsPropValue =