Merge pull request #21473 from thtliife/next

fix: Storybook does not respect BROWSER env var
storybookjs · May 22, 2023 · 7ed98c7 · 7ed98c7
2 parents a8f4dce + 25700a2
commit 7ed98c7
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/code/lib/core-server/src/utils/open-in-browser.ts b/code/lib/core-server/src/utils/open-in-browser.ts
@@ -5,14 +5,29 @@ import getDefaultBrowser from '@aw-web-design/x-default-browser';
 import { dedent } from 'ts-dedent';
 
 export function openInBrowser(address: string) {
+  const browserEnvVar = process.env.BROWSER;
+  const userBrowserIsChrome =
+    browserEnvVar === 'chrome' ||
+    browserEnvVar === 'chromium' ||
+    browserEnvVar === 'brave' ||
+    browserEnvVar === 'com.brave.browser';
+
+  const openOptions = browserEnvVar ? { app: { name: browserEnvVar } } : {};
+
   getDefaultBrowser(async (err: any, res: any) => {
     try {
-      if (res && (res.isChrome || res.isChromium || res.identity === 'com.brave.browser')) {
+      if (
+        res &&
+        (res.isChrome ||
+          res.isChromium ||
+          res.identity === 'com.brave.browser' ||
+          userBrowserIsChrome)
+      ) {
         // We use betterOpn for Chrome because it is better at handling which chrome tab
         // or window the preview loads in.
         betterOpn(address);
       } else {
-        await open(address);
+        await open(address, openOptions);
       }
     } catch (error) {
       logger.error(dedent`