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

package/lib/commands/start/start.js

@@ -8,12 +8,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = start;
 const tslib_1 = require("tslib");
-const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
+const logger_1 = tslib_1.__importStar(require("@docusaurus/logger"));
 const openBrowser_1 = tslib_1.__importDefault(require("../utils/openBrowser/openBrowser"));
 const watcher_1 = require("./watcher");
 const webpack_1 = require("./webpack");
 const utils_1 = require("./utils");
-async function start(siteDirParam = '.', cliOptions = {}) {
+async function doStart(siteDirParam = '.', cliOptions = {}) {
     logger_1.default.info('Starting the development server...');
     // Temporary workaround to unlock the ability to translate the site config
     // We'll remove it if a better official API can be designed
@@ -44,3 +44,6 @@ async function start(siteDirParam = '.', cliOptions = {}) {
         await (0, openBrowser_1.default)(reloadableSite.getOpenUrl());
     }
 }
+async function start(siteDirParam = '.', cliOptions = {}) {
+    return logger_1.PerfLogger.async('CLI start', () => doStart(siteDirParam, cliOptions));
+}

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/lib/webpack/base.js

@@ -16,6 +16,7 @@ const babel_1 = require("@docusaurus/babel");
 const bundler_1 = require("@docusaurus/bundler");
 const utils_1 = require("@docusaurus/utils");
 const aliases_1 = require("./aliases");
+const BundlerCPUProfilerPlugin_1 = require("./plugins/BundlerCPUProfilerPlugin");
 const CSS_REGEX = /\.css$/i;
 const CSS_MODULE_REGEX = /\.module\.css$/i;
 exports.clientDir = path_1.default.join(__dirname, '..', 'client');
@@ -283,6 +284,8 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
                 // for more reasoning
                 ignoreOrder: true,
             }),
-        ],
+            process.env.DOCUSAURUS_BUNDLER_CPU_PROFILE &&
+                new BundlerCPUProfilerPlugin_1.BundlerCPUProfilerPlugin(),
+        ].filter(Boolean),
     };
 }

package/lib/webpack/plugins/BundlerCPUProfilerPlugin.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import type { Compiler } from 'webpack';
+export declare class BundlerCPUProfilerPlugin {
+    output: string;
+    constructor(output?: string);
+    apply(compiler: Compiler): void;
+}

package/lib/webpack/plugins/BundlerCPUProfilerPlugin.js

@@ -0,0 +1,41 @@
+"use strict";
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BundlerCPUProfilerPlugin = void 0;
+const tslib_1 = require("tslib");
+const node_inspector_1 = tslib_1.__importDefault(require("node:inspector"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+// Bundle CPU profiling plugin, contributed by the Rspack team
+// Can be opened in https://www.speedscope.app/
+// See also https://github.com/jerrykingxyz/docusaurus/pull/1
+// See also https://github.com/facebook/docusaurus/pull/10985
+class BundlerCPUProfilerPlugin {
+    constructor(output) {
+        this.output = output ?? './bundler-cpu-profile.json';
+    }
+    apply(compiler) {
+        const session = new node_inspector_1.default.Session();
+        session.connect();
+        session.post('Profiler.enable');
+        session.post('Profiler.start');
+        // In dev/watch mode, we restart the profiler before each compilation
+        compiler.hooks.watchRun.tapPromise(BundlerCPUProfilerPlugin.name, async () => {
+            session.post('Profiler.start');
+        });
+        compiler.hooks.done.tapPromise(BundlerCPUProfilerPlugin.name, async () => {
+            session.post('Profiler.stop', (error, param) => {
+                if (error) {
+                    console.error('Failed to generate JS CPU profile:', error);
+                    return;
+                }
+                fs_extra_1.default.writeFile(this.output, JSON.stringify(param.profile)).catch(console.error);
+            });
+        });
+    }
+}
+exports.BundlerCPUProfilerPlugin = BundlerCPUProfilerPlugin;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "3.7.0-canary-6261",
+  "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-6261",
-    "@docusaurus/bundler": "3.7.0-canary-6261",
-    "@docusaurus/logger": "3.7.0-canary-6261",
-    "@docusaurus/mdx-loader": "3.7.0-canary-6261",
-    "@docusaurus/utils": "3.7.0-canary-6261",
-    "@docusaurus/utils-common": "3.7.0-canary-6261",
-    "@docusaurus/utils-validation": "3.7.0-canary-6261",
+    "@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-6261",
-    "@docusaurus/types": "3.7.0-canary-6261",
+    "@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": "a93b982c4a8fd345bae11d2d896c5381af5af2b0"
+  "gitHead": "f87a715b107175497b8bb2d0ec7b8323c38e1853"
 }