@docusaurus/core 3.7.0-canary-6262 → 3.7.0-canary-6263

package/lib/commands/utils/openBrowser/openBrowser.js

@@ -14,7 +14,10 @@ const tslib_1 = require("tslib");
 // See https://github.com/facebook/create-react-app/blob/main/packages/react-dev-utils/openBrowser.js
 /* eslint-disable */
 const child_process_1 = require("child_process");
+const util_1 = require("util");
 const open_1 = tslib_1.__importDefault(require("open"));
+const logger_1 = require("@docusaurus/logger");
+const execPromise = (0, util_1.promisify)(child_process_1.exec);
 // Not sure if we need this, but let's keep a secret escape hatch
 // CRA/react-dev-utils supported BROWSER/BROWSER_ARGS
 const BrowserEnv = process.env.DOCUSAURUS_BROWSER;
@@ -33,30 +36,45 @@ async function tryOpenWithAppleScript({ url, browser, }) {
         return false;
     }
     if (shouldTryOpenChromiumWithAppleScript) {
-        // Will use the first open browser found from list
-        const supportedChromiumBrowsers = [
-            'Google Chrome Canary',
-            'Google Chrome Dev',
-            'Google Chrome Beta',
-            'Google Chrome',
-            'Microsoft Edge',
-            'Brave Browser',
-            'Vivaldi',
-            'Chromium',
-        ];
-        for (let chromiumBrowser of supportedChromiumBrowsers) {
+        async function getBrowsersToTry() {
+            // Will use the first open browser found from list
+            const supportedChromiumBrowsers = [
+                'Google Chrome Canary',
+                'Google Chrome Dev',
+                'Google Chrome Beta',
+                'Google Chrome',
+                'Microsoft Edge',
+                'Brave Browser',
+                'Vivaldi',
+                'Chromium',
+            ];
+            // Among all the supported browsers, retrieves to stdout the active ones
+            const command = `ps cax -o command | grep -E "^(${supportedChromiumBrowsers.join('|')})$"`;
+            const result = await execPromise(command);
+            const activeBrowsers = result.stdout.toString().trim().split('\n');
+            // This preserves the initial browser order
+            // We open Google Chrome Canary in priority over Google Chrome
+            return supportedChromiumBrowsers.filter((b) => activeBrowsers.includes(b));
+        }
+        async function tryBrowser(browserName) {
             try {
-                // Try our best to reuse existing tab
-                // on OSX Chromium-based browser with AppleScript
-                (0, child_process_1.execSync)(`ps cax | grep "${chromiumBrowser}"`);
-                (0, child_process_1.execSync)(`osascript openChrome.applescript "${encodeURI(url)}" "${chromiumBrowser}"`, {
+                // This command runs the openChrome.applescript (copied from CRA)
+                const command = `osascript openChrome.applescript "${encodeURI(url)}" "${browserName}"`;
+                await execPromise(command, {
                     cwd: __dirname,
-                    stdio: 'ignore',
                 });
                 return true;
             }
             catch (err) {
-                // Ignore errors.
+                console.error(`Failed to open browser ${browserName} with AppleScript`, err);
+                return false;
+            }
+        }
+        const browsers = await logger_1.PerfLogger.async('getBrowsersToTry', () => getBrowsersToTry());
+        for (let browser of browsers) {
+            const success = await logger_1.PerfLogger.async(browser, () => tryBrowser(browser));
+            if (success) {
+                return true;
             }
         }
     }
@@ -80,7 +98,7 @@ function toOpenApp(params) {
     };
 }
 async function startBrowserProcess(params) {
-    if (await tryOpenWithAppleScript(params)) {
+    if (await logger_1.PerfLogger.async('tryOpenWithAppleScript', () => tryOpenWithAppleScript(params))) {
         return true;
     }
     try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "3.7.0-canary-6262",
+  "version": "3.7.0-canary-6263",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,13 +33,13 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "3.7.0-canary-6262",
-    "@docusaurus/bundler": "3.7.0-canary-6262",
-    "@docusaurus/logger": "3.7.0-canary-6262",
-    "@docusaurus/mdx-loader": "3.7.0-canary-6262",
-    "@docusaurus/utils": "3.7.0-canary-6262",
-    "@docusaurus/utils-common": "3.7.0-canary-6262",
-    "@docusaurus/utils-validation": "3.7.0-canary-6262",
+    "@docusaurus/babel": "3.7.0-canary-6263",
+    "@docusaurus/bundler": "3.7.0-canary-6263",
+    "@docusaurus/logger": "3.7.0-canary-6263",
+    "@docusaurus/mdx-loader": "3.7.0-canary-6263",
+    "@docusaurus/utils": "3.7.0-canary-6263",
+    "@docusaurus/utils-common": "3.7.0-canary-6263",
+    "@docusaurus/utils-validation": "3.7.0-canary-6263",
     "boxen": "^6.2.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -78,8 +78,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.7.0-canary-6262",
-    "@docusaurus/types": "3.7.0-canary-6262",
+    "@docusaurus/module-type-aliases": "3.7.0-canary-6263",
+    "@docusaurus/types": "3.7.0-canary-6263",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -99,5 +99,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "dece03f917b38ae183df551a66752d6d482d85a2"
+  "gitHead": "f87a715b107175497b8bb2d0ec7b8323c38e1853"
 }