@docusaurus/core 3.7.0-canary-6245 → 3.7.0-canary-6246

package/lib/commands/serve.js

@@ -14,8 +14,8 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
 const serve_handler_1 = tslib_1.__importDefault(require("serve-handler"));
-const openBrowser_1 = tslib_1.__importDefault(require("react-dev-utils/openBrowser"));
 const utils_common_1 = require("@docusaurus/utils-common");
+const openBrowser_1 = tslib_1.__importDefault(require("./utils/openBrowser/openBrowser"));
 const config_1 = require("../server/config");
 const build_1 = require("./build/build");
 const getHostPort_1 = require("../server/getHostPort");
@@ -86,6 +86,6 @@ async function serve(siteDirParam = '.', cliOptions = {}) {
     logger_1.default.success `Serving path=${buildDir} directory at: url=${url}`;
     server.listen(port);
     if (cliOptions.open && !process.env.CI) {
-        (0, openBrowser_1.default)(url);
+        await (0, openBrowser_1.default)(url);
     }
 }

package/lib/commands/start/start.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = start;
 const tslib_1 = require("tslib");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
-const openBrowser_1 = tslib_1.__importDefault(require("react-dev-utils/openBrowser"));
+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");
@@ -41,6 +41,6 @@ async function start(siteDirParam = '.', cliOptions = {}) {
     });
     await devServer.start();
     if (cliOptions.open) {
-        (0, openBrowser_1.default)(reloadableSite.getOpenUrl());
+        await (0, openBrowser_1.default)(reloadableSite.getOpenUrl());
     }
 }

package/lib/commands/start/utils.js

@@ -10,13 +10,28 @@ exports.createOpenUrlContext = createOpenUrlContext;
 exports.createReloadableSite = createReloadableSite;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const url_1 = tslib_1.__importDefault(require("url"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
-const WebpackDevServerUtils_1 = require("react-dev-utils/WebpackDevServerUtils");
 const utils_1 = require("@docusaurus/utils");
 const logger_1 = tslib_1.__importStar(require("@docusaurus/logger"));
 const getHostPort_1 = require("../../server/getHostPort");
 const site_1 = require("../../server/site");
 const pluginsUtils_1 = require("../../server/plugins/pluginsUtils");
+// This code was historically in CRA/react-dev-utils (deprecated in 2025)
+// We internalized it, refactored and removed useless code paths
+// See https://github.com/facebook/docusaurus/pull/10956
+// See https://github.com/facebook/create-react-app/blob/main/packages/react-dev-utils/WebpackDevServerUtils.js
+function getOpenUrlOrigin(protocol, host, port) {
+    const isUnspecifiedHost = host === '0.0.0.0' || host === '::';
+    const prettyHost = isUnspecifiedHost ? 'localhost' : host;
+    const localUrlForBrowser = url_1.default.format({
+        protocol,
+        hostname: prettyHost,
+        port,
+        pathname: '/',
+    });
+    return localUrlForBrowser;
+}
 async function createOpenUrlContext({ cliOptions, }) {
     const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
     const { host, port } = await (0, getHostPort_1.getHostPort)(cliOptions);
@@ -24,9 +39,8 @@ async function createOpenUrlContext({ cliOptions, }) {
         return process.exit();
     }
     const getOpenUrl = ({ baseUrl, router }) => {
-        const urls = (0, WebpackDevServerUtils_1.prepareUrls)(protocol, host, port);
         return (0, utils_1.normalizeUrl)([
-            urls.localUrlForBrowser,
+            getOpenUrlOrigin(protocol, host, port),
             router === 'hash' ? '/#/' : '',
             baseUrl,
         ]);

package/lib/commands/start/webpack.js

@@ -13,7 +13,7 @@ const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
 const bundler_1 = require("@docusaurus/bundler");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const webpack_dev_server_1 = tslib_1.__importDefault(require("webpack-dev-server"));
-const evalSourceMapMiddleware_1 = tslib_1.__importDefault(require("react-dev-utils/evalSourceMapMiddleware"));
+const evalSourceMapMiddleware_1 = tslib_1.__importDefault(require("../utils/legacy/evalSourceMapMiddleware"));
 const watcher_1 = require("./watcher");
 const getHttpsConfig_1 = tslib_1.__importDefault(require("../../webpack/utils/getHttpsConfig"));
 const configure_1 = require("../../webpack/configure");

package/lib/commands/utils/legacy/evalSourceMapMiddleware.d.ts

@@ -0,0 +1,2 @@
+declare function _exports(server: import("webpack-dev-server").default): import("express").Handler;
+export = _exports;

package/lib/commands/utils/legacy/evalSourceMapMiddleware.js

@@ -0,0 +1,57 @@
+/**
+ * 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.
+ */
+
+// TODO Legacy CRA react-dev-utils package code
+//  This code was in CRA/react-dev-utils (deprecated in 2025)
+//  We just copied the code as-is to remove a fat/useless dependency subtree
+//  See https://github.com/facebook/docusaurus/pull/10956
+//  See https://github.com/facebook/create-react-app/blob/main/packages/react-dev-utils/evalSourceMapMiddleware.js
+
+/* eslint-disable */
+
+function base64SourceMap(source) {
+  const base64 = Buffer.from(JSON.stringify(source.map()), 'utf8').toString(
+    'base64',
+  );
+  return `data:application/json;charset=utf-8;base64,${base64}`;
+}
+
+function getSourceById(server, id) {
+  const module = Array.from(server._stats.compilation.modules).find(
+    (m) => server._stats.compilation.chunkGraph.getModuleId(m) == id,
+  );
+  return module.originalSource();
+}
+
+/**
+ * Middleware responsible for retrieving a generated source
+ * Receives a webpack internal url: "webpack-internal:///<module-id>"
+ * Returns a generated source: "<source-text><sourceMappingURL><sourceURL>"
+ *
+ * Based on EvalSourceMapDevToolModuleTemplatePlugin.js
+ *
+ * @param {import("webpack-dev-server").default} server
+ * @returns {import("express").Handler}
+ */
+module.exports = function createEvalSourceMapMiddleware(server) {
+  return function handleWebpackInternalMiddleware(req, res, next) {
+    if (req.url.startsWith('/__get-internal-source')) {
+      const fileName = req.query.fileName;
+      const id = fileName.match(/webpack-internal:\/\/\/(.+)/)[1];
+      if (!id || !server._stats) {
+        next();
+      }
+
+      const source = getSourceById(server, id);
+      const sourceMapURL = `//# sourceMappingURL=${base64SourceMap(source)}`;
+      const sourceURL = `//# sourceURL=webpack-internal:///${module.id}`;
+      res.end(`${source.source()}\n${sourceMapURL}\n${sourceURL}`);
+    } else {
+      next();
+    }
+  };
+};

package/lib/commands/utils/openBrowser/openBrowser.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 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.
+ */
+/**
+ * Returns true if it opened a browser
+ */
+export default function openBrowser(url: string): Promise<boolean>;

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

@@ -0,0 +1,106 @@
+"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.default = openBrowser;
+const tslib_1 = require("tslib");
+// This code was initially in CRA/react-dev-utils (deprecated in 2025)
+// We copied and refactored it
+// See https://github.com/facebook/docusaurus/pull/10956
+// 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 open_1 = tslib_1.__importDefault(require("open"));
+// 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;
+const BrowserEnvArgs = process.env.DOCUSAURUS_BROWSER_ARGS
+    ? process.env.DOCUSAURUS_BROWSER_ARGS.split(' ')
+    : [];
+// If we're on OS X, the user hasn't specifically
+// requested a different browser, we can try opening
+// Chrome with AppleScript. This lets us reuse an
+// existing tab when possible instead of creating a new one.
+// Copied from https://github.com/facebook/create-react-app/blob/main/packages/react-dev-utils/openBrowser.js
+async function tryOpenWithAppleScript({ url, browser, }) {
+    const shouldTryOpenChromiumWithAppleScript = process.platform === 'darwin' &&
+        (typeof browser !== 'string' || browser === 'google chrome');
+    if (!shouldTryOpenChromiumWithAppleScript) {
+        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) {
+            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}"`, {
+                    cwd: __dirname,
+                    stdio: 'ignore',
+                });
+                return true;
+            }
+            catch (err) {
+                // Ignore errors.
+            }
+        }
+    }
+    return false;
+}
+function toOpenApp(params) {
+    if (!params.browser) {
+        return undefined;
+    }
+    // Handles "cross-platform" shortcuts like "chrome", "firefox", "edge"
+    if (open_1.default.apps[params.browser]) {
+        return {
+            name: open_1.default.apps[params.browser],
+            arguments: params.browserArgs,
+        };
+    }
+    // Fallback to platform-specific app name
+    return {
+        name: params.browser,
+        arguments: params.browserArgs,
+    };
+}
+async function startBrowserProcess(params) {
+    if (await tryOpenWithAppleScript(params)) {
+        return true;
+    }
+    try {
+        await (0, open_1.default)(params.url, {
+            app: toOpenApp(params),
+            wait: false,
+        });
+        return true;
+    }
+    catch (err) {
+        return false;
+    }
+}
+/**
+ * Returns true if it opened a browser
+ */
+async function openBrowser(url) {
+    return startBrowserProcess({
+        url,
+        browser: BrowserEnv,
+        browserArgs: BrowserEnvArgs,
+    });
+}

package/lib/commands/utils/openBrowser/openChrome.applescript

@@ -0,0 +1,94 @@
+(*
+Copyright (c) 2015-present, Facebook, Inc.
+
+This source code is licensed under the MIT license found in the
+LICENSE file in the root directory of this source tree.
+*)
+
+property targetTab: null
+property targetTabIndex: -1
+property targetWindow: null
+property theProgram: "Google Chrome"
+
+on run argv
+  set theURL to item 1 of argv
+
+  -- Allow requested program to be optional,
+  -- default to Google Chrome
+  if (count of argv) > 1 then
+    set theProgram to item 2 of argv
+  end if
+
+  using terms from application "Google Chrome"
+    tell application theProgram
+
+      if (count every window) = 0 then
+        make new window
+      end if
+
+      -- 1: Looking for tab running debugger
+      -- then, Reload debugging tab if found
+      -- then return
+      set found to my lookupTabWithUrl(theURL)
+      if found then
+        set targetWindow's active tab index to targetTabIndex
+        tell targetTab to reload
+        tell targetWindow to activate
+        set index of targetWindow to 1
+        return
+      end if
+
+      -- 2: Looking for Empty tab
+      -- In case debugging tab was not found
+      -- We try to find an empty tab instead
+      set found to my lookupTabWithUrl("chrome://newtab/")
+      if found then
+        set targetWindow's active tab index to targetTabIndex
+        set URL of targetTab to theURL
+        tell targetWindow to activate
+        return
+      end if
+
+      -- 3: Create new tab
+      -- both debugging and empty tab were not found
+      -- make a new tab with url
+      tell window 1
+        activate
+        make new tab with properties {URL:theURL}
+      end tell
+    end tell
+  end using terms from
+end run
+
+-- Function:
+-- Lookup tab with given url
+-- if found, store tab, index, and window in properties
+-- (properties were declared on top of file)
+on lookupTabWithUrl(lookupUrl)
+  using terms from application "Google Chrome"
+    tell application theProgram
+      -- Find a tab with the given url
+      set found to false
+      set theTabIndex to -1
+      repeat with theWindow in every window
+        set theTabIndex to 0
+        repeat with theTab in every tab of theWindow
+          set theTabIndex to theTabIndex + 1
+          if (theTab's URL as string) contains lookupUrl then
+            -- assign tab, tab index, and window to properties
+            set targetTab to theTab
+            set targetTabIndex to theTabIndex
+            set targetWindow to theWindow
+            set found to true
+            exit repeat
+          end if
+        end repeat
+
+        if found then
+          exit repeat
+        end if
+      end repeat
+    end tell
+  end using terms from
+  return found
+end lookupTabWithUrl

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "3.7.0-canary-6245",
+  "version": "3.7.0-canary-6246",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,13 +33,13 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "3.7.0-canary-6245",
-    "@docusaurus/bundler": "3.7.0-canary-6245",
-    "@docusaurus/logger": "3.7.0-canary-6245",
-    "@docusaurus/mdx-loader": "3.7.0-canary-6245",
-    "@docusaurus/utils": "3.7.0-canary-6245",
-    "@docusaurus/utils-common": "3.7.0-canary-6245",
-    "@docusaurus/utils-validation": "3.7.0-canary-6245",
+    "@docusaurus/babel": "3.7.0-canary-6246",
+    "@docusaurus/bundler": "3.7.0-canary-6246",
+    "@docusaurus/logger": "3.7.0-canary-6246",
+    "@docusaurus/mdx-loader": "3.7.0-canary-6246",
+    "@docusaurus/utils": "3.7.0-canary-6246",
+    "@docusaurus/utils-common": "3.7.0-canary-6246",
+    "@docusaurus/utils-validation": "3.7.0-canary-6246",
     "boxen": "^6.2.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -58,9 +58,9 @@
     "html-webpack-plugin": "^5.6.0",
     "leven": "^3.1.0",
     "lodash": "^4.17.21",
+    "open": "^8.4.0",
     "p-map": "^4.0.0",
     "prompts": "^2.4.2",
-    "react-dev-utils": "^12.0.1",
     "react-helmet-async": "npm:@slorber/react-helmet-async@1.3.0",
     "react-loadable": "npm:@docusaurus/react-loadable@6.0.0",
     "react-loadable-ssr-addon-v5-slorber": "^1.0.1",
@@ -78,8 +78,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "3.7.0-canary-6245",
-    "@docusaurus/types": "3.7.0-canary-6245",
+    "@docusaurus/module-type-aliases": "3.7.0-canary-6246",
+    "@docusaurus/types": "3.7.0-canary-6246",
     "@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": "65621de892b3c3b011c9888712803039301672c9"
+  "gitHead": "6e2458e85cfd031ba2930419774f37e0f0871d67"
 }