@docusaurus/core 4.0.0-canary-6964 → 4.0.0-canary-6966

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

@@ -5,16 +5,21 @@
  * LICENSE file in the root directory of this source tree.
  */
 import _ from 'lodash';
+import { type HttpsConfig } from '../../webpack/utils/getHttpsConfig';
 import type { StartCLIOptions } from './start';
 import type { LoadedPlugin, RouterType } from '@docusaurus/types';
 export type OpenUrlContext = {
     host: string;
     port: number;
+    httpsConfig: HttpsConfig;
     getOpenUrl: ({ baseUrl, router, }: {
         baseUrl: string;
         router: RouterType;
     }) => string;
 };
+export declare function createOpenUrlContext({ cliOptions, }: {
+    cliOptions: StartCLIOptions;
+}): Promise<OpenUrlContext>;
 type StartParams = {
     siteDirParam: string;
     cliOptions: Partial<StartCLIOptions>;

package/lib/commands/start/utils.js

@@ -6,6 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createOpenUrlContext = createOpenUrlContext;
 exports.createReloadableSite = createReloadableSite;
 const tslib_1 = require("tslib");
 const node_url_1 = tslib_1.__importDefault(require("node:url"));
@@ -14,6 +15,7 @@ const utils_1 = require("@docusaurus/utils");
 const logger_1 = tslib_1.__importStar(require("@docusaurus/logger"));
 const fs_1 = require("@docusaurus/fs");
 const getHostPort_1 = require("../../server/getHostPort");
+const getHttpsConfig_1 = tslib_1.__importDefault(require("../../webpack/utils/getHttpsConfig"));
 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)
@@ -32,7 +34,12 @@ function getOpenUrlOrigin(protocol, host, port) {
     return localUrlForBrowser;
 }
 async function createOpenUrlContext({ cliOptions, }) {
-    const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
+    const httpsConfig = await (0, getHttpsConfig_1.default)({
+        https: cliOptions.https,
+        sslCert: cliOptions.sslCert,
+        sslKey: cliOptions.sslKey,
+    });
+    const protocol = httpsConfig ? 'https' : 'http';
     const { host, port } = await (0, getHostPort_1.getHostPort)(cliOptions);
     if (port === null) {
         return process.exit();
@@ -44,7 +51,7 @@ async function createOpenUrlContext({ cliOptions, }) {
             baseUrl,
         ]);
     };
-    return { host, port, getOpenUrl };
+    return { host, port, httpsConfig, getOpenUrl };
 }
 async function createLoadSiteParams({ siteDirParam, cliOptions, }) {
     const siteDir = await (0, fs_1.realpath)(siteDirParam);

package/lib/commands/start/webpack.js

@@ -12,9 +12,7 @@ const node_path_1 = tslib_1.__importDefault(require("node:path"));
 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 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");
 const client_1 = require("../../webpack/client");
 // E2E_TEST=true docusaurus start
@@ -37,14 +35,9 @@ function registerWebpackE2ETestHook(compiler) {
         }
     });
 }
-async function createDevServerConfig({ cliOptions, props, host, port, }) {
+function createDevServerConfig({ cliOptions, props, host, port, httpsConfig, }) {
     const { baseUrl, siteDir, siteConfig } = props;
     const pollingOptions = (0, watcher_1.createPollingOptions)(cliOptions);
-    const httpsConfig = await (0, getHttpsConfig_1.default)({
-        https: cliOptions.https,
-        sslCert: cliOptions.sslCert,
-        sslKey: cliOptions.sslKey,
-    });
     // https://webpack.js.org/configuration/dev-server
     return {
         hot: cliOptions.hotOnly ? 'only' : true,
@@ -93,11 +86,6 @@ async function createDevServerConfig({ cliOptions, props, host, port, }) {
         allowedHosts: 'all',
         host,
         port,
-        setupMiddlewares: (middlewares, devServer) => {
-            // This lets us fetch source contents from webpack for the error overlay.
-            middlewares.unshift((0, evalSourceMapMiddleware_1.default)(devServer));
-            return middlewares;
-        },
     };
 }
 async function getStartClientConfig({ props, minify, poll, configureWebpackUtils, }) {
@@ -128,11 +116,12 @@ async function createWebpackDevServer({ props, cliOptions, openUrlContext, }) {
     });
     const compiler = props.currentBundler.instance(config);
     registerWebpackE2ETestHook(compiler);
-    const defaultDevServerConfig = await createDevServerConfig({
+    const defaultDevServerConfig = createDevServerConfig({
         cliOptions,
         props,
         host: openUrlContext.host,
         port: openUrlContext.port,
+        httpsConfig: openUrlContext.httpsConfig,
     });
     // Allow plugin authors to customize/override devServer config
     const devServerConfig = (0, webpack_merge_1.default)([defaultDevServerConfig, config.devServer].filter(Boolean));

package/lib/webpack/utils/getHttpsConfig.d.ts

@@ -9,8 +9,9 @@ type HttpsConfigOptions = {
     sslCert: string;
     sslKey: string;
 };
-export default function getHttpsConfig(options?: Partial<HttpsConfigOptions>): Promise<boolean | {
+export type HttpsConfig = boolean | {
     cert: Buffer;
     key: Buffer;
-}>;
+};
+export default function getHttpsConfig(options?: Partial<HttpsConfigOptions>): Promise<HttpsConfig>;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "4.0.0-canary-6964",
+  "version": "4.0.0-canary-6966",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -27,15 +27,15 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "4.0.0-canary-6964",
-    "@docusaurus/bundler": "4.0.0-canary-6964",
-    "@docusaurus/fs": "4.0.0-canary-6964",
-    "@docusaurus/glob": "4.0.0-canary-6964",
-    "@docusaurus/logger": "4.0.0-canary-6964",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6964",
-    "@docusaurus/utils": "4.0.0-canary-6964",
-    "@docusaurus/utils-common": "4.0.0-canary-6964",
-    "@docusaurus/utils-validation": "4.0.0-canary-6964",
+    "@docusaurus/babel": "4.0.0-canary-6966",
+    "@docusaurus/bundler": "4.0.0-canary-6966",
+    "@docusaurus/fs": "4.0.0-canary-6966",
+    "@docusaurus/glob": "4.0.0-canary-6966",
+    "@docusaurus/logger": "4.0.0-canary-6966",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6966",
+    "@docusaurus/utils": "4.0.0-canary-6966",
+    "@docusaurus/utils-common": "4.0.0-canary-6966",
+    "@docusaurus/utils-validation": "4.0.0-canary-6966",
     "@rspack/core": "^2.2.3",
     "@rspack/dev-server": "^2.2.1",
     "boxen": "^9.0.0",
@@ -68,8 +68,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6964",
-    "@docusaurus/types": "4.0.0-canary-6964",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6966",
+    "@docusaurus/types": "4.0.0-canary-6966",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/escape-html": "^1.0.4",
     "@types/history": "^4.7.11",

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

@@ -1,18 +0,0 @@
-/**
- * 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.
- */
-export = createEvalSourceMapMiddleware;
-/**
- * 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}
- */
-declare function createEvalSourceMapMiddleware(server: import("webpack-dev-server").default): import("express").Handler;

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

@@ -1,57 +0,0 @@
-/**
- * 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();
-    }
-  };
-};