@docusaurus/core 4.0.0-canary-6912 → 4.0.0-canary-6917

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

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { RspackDevServer } from '@docusaurus/bundler';
-import WebpackDevServer from 'webpack-dev-server';
 import type { StartCLIOptions } from './start';
 import type { Props } from '@docusaurus/types';
+import type WebpackDevServer from 'webpack-dev-server';
 import type { OpenUrlContext } from './utils';
 export declare function createWebpackDevServer({ props, cliOptions, openUrlContext, }: {
     props: Props;

package/lib/commands/start/webpack.js

@@ -12,7 +12,6 @@ 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 webpack_dev_server_1 = tslib_1.__importDefault(require("webpack-dev-server"));
 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"));
@@ -145,7 +144,9 @@ async function createWebpackDevServer({ props, cliOptions, openUrlContext, }) {
 }
 async function createDevServer({ devServerConfig, compiler, currentBundler, }) {
     if (currentBundler.name === 'webpack') {
-        return new webpack_dev_server_1.default(devServerConfig, compiler);
+        // Imported lazily, only when Webpack is used
+        const { default: WebpackDevServer } = await import('webpack-dev-server');
+        return new WebpackDevServer(devServerConfig, compiler);
     }
     // Docusaurus bundler configs are typed with Webpack types
     return new bundler_1.RspackDevServer(devServerConfig, compiler);

package/lib/webpack/base.js

@@ -20,6 +20,13 @@ const BundlerCPUProfilerPlugin_1 = require("./plugins/BundlerCPUProfilerPlugin")
 const CSS_REGEX = /\.css$/i;
 const CSS_MODULE_REGEX = /\.module\.css$/i;
 exports.clientDir = node_path_1.default.join(__dirname, '..', 'client');
+// The RealContentHashPlugin replaces every occurrence of a provisional chunk
+// hash in all assets, even inside unrelated hex strings (file-loader asset
+// names, colors, numbers...). The client and server compilations do it
+// independently, so a false positive can make the SSG HTML reference a missing
+// file. 10 chars instead of 8 makes it ~256x less likely.
+// See https://github.com/web-infra-dev/rspack/issues/8474
+const contentHash = '[contenthash:10]';
 function getReactAliases(siteDir) {
     // Escape hatch
     if (process.env.DOCUSAURUS_NO_REACT_ALIASES) {
@@ -114,9 +121,9 @@ async function createBaseConfig({ props, isServer, minify, configureWebpackUtils
         output: {
             pathinfo: false,
             path: outDir,
-            filename: isProd ? 'assets/js/[name].[contenthash:8].js' : '[name].js',
+            filename: isProd ? `assets/js/[name].${contentHash}.js` : '[name].js',
             chunkFilename: isProd
-                ? 'assets/js/[name].[contenthash:8].js'
+                ? `assets/js/[name].${contentHash}.js`
                 : '[name].js',
             publicPath: siteConfig.future.experimental_router === 'hash' ? 'auto' : baseUrl,
             hashFunction: 'xxhash64',
@@ -252,10 +259,10 @@ async function createBaseConfig({ props, isServer, minify, configureWebpackUtils
         plugins: [
             new CSSExtractPlugin({
                 filename: isProd
-                    ? 'assets/css/[name].[contenthash:8].css'
+                    ? `assets/css/[name].${contentHash}.css`
                     : '[name].css',
                 chunkFilename: isProd
-                    ? 'assets/css/[name].[contenthash:8].css'
+                    ? `assets/css/[name].${contentHash}.css`
                     : '[name].css',
                 // Remove css order warnings if css imports are not sorted
                 // alphabetically. See https://github.com/webpack-contrib/mini-css-extract-plugin/pull/422

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

@@ -4,7 +4,7 @@
  * 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';
+import type { Compiler } from 'webpack';
 export default class ChunkAssetPlugin {
     apply(compiler: Compiler): void;
 }

package/lib/webpack/plugins/ChunkAssetPlugin.js

@@ -6,8 +6,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const webpack_1 = tslib_1.__importDefault(require("webpack"));
 // Adds a custom Docusaurus Webpack runtime function `__webpack_require__.gca`
 // gca = Get Chunk Asset, it converts a chunkName to a JS asset URL
 // It is called in Core client/docusaurus.ts for chunk preloading/prefetching
@@ -16,7 +14,7 @@ const webpack_1 = tslib_1.__importDefault(require("webpack"));
 // The name of the custom Docusaurus Webpack runtime function
 const DocusaurusGetChunkAssetFn = '__webpack_require__.gca';
 const PluginName = 'Docusaurus-ChunkAssetPlugin';
-function generateGetChunkAssetRuntimeCode(chunk) {
+function generateGetChunkAssetRuntimeCode({ chunk, bundler, }) {
     const chunkIdToName = chunk.getChunkMaps(false).name;
     const chunkNameToId = Object.fromEntries(Object.entries(chunkIdToName).map(([chunkId, chunkName]) => [
         chunkName,
@@ -30,10 +28,10 @@ function generateGetChunkAssetRuntimeCode(chunk) {
     // getChunkScriptFilename = __webpack_require__.u
     // Example: getChunkScriptFilename("814f3328") = "814f3328.03fcc178.js"
     // https://github.com/webpack/webpack/blob/v5.94.0/lib/runtime/GetChunkFilenameRuntimeModule.js
-    getChunkScriptFilename, } = webpack_1.default.RuntimeGlobals;
+    getChunkScriptFilename, } = bundler.RuntimeGlobals;
     const code = `// Docusaurus function to get chunk asset
 ${DocusaurusGetChunkAssetFn} = function(chunkId) { chunkId = ${JSON.stringify(chunkNameToId)}[chunkId]||chunkId; return ${publicPath} + ${getChunkScriptFilename}(chunkId); };`;
-    return webpack_1.default.Template.asString(code);
+    return bundler.Template.asString(code);
 }
 /*
  Note: we previously used `MainTemplate.hooks.requireExtensions.tap()`
@@ -44,6 +42,9 @@ ${DocusaurusGetChunkAssetFn} = function(chunkId) { chunkId = ${JSON.stringify(ch
  */
 class ChunkAssetPlugin {
     apply(compiler) {
+        // Use the compiler's bundler instance (Webpack or Rspack)
+        // This avoids loading Webpack when using Rspack
+        const ChunkAssetRuntimeModule = createChunkAssetRuntimeModuleClass(compiler.webpack);
         compiler.hooks.thisCompilation.tap(PluginName, (compilation) => {
             compilation.hooks.additionalTreeRuntimeRequirements.tap(PluginName, (chunk) => {
                 compilation.addRuntimeModule(chunk, new ChunkAssetRuntimeModule());
@@ -55,12 +56,14 @@ exports.default = ChunkAssetPlugin;
 // Inspired by https://github.com/webpack/webpack/blob/v5.94.0/lib/runtime/CompatRuntimeModule.js
 // See also https://rspack.dev/api/javascript-api/compilation#addruntimemodule
 // See also https://rspack.dev/api/plugin-api/compilation-hooks#additionaltreeruntimerequirements
-class ChunkAssetRuntimeModule extends webpack_1.default.RuntimeModule {
-    constructor() {
-        super('ChunkAssetRuntimeModule', webpack_1.default.RuntimeModule.STAGE_ATTACH);
-        this.fullHash = true;
-    }
-    generate() {
-        return generateGetChunkAssetRuntimeCode(this.chunk);
-    }
+function createChunkAssetRuntimeModuleClass(bundler) {
+    return class ChunkAssetRuntimeModule extends bundler.RuntimeModule {
+        constructor() {
+            super('ChunkAssetRuntimeModule', bundler.RuntimeModule.STAGE_ATTACH);
+            this.fullHash = true;
+        }
+        generate() {
+            return generateGetChunkAssetRuntimeCode({ chunk: this.chunk, bundler });
+        }
+    };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "4.0.0-canary-6912",
+  "version": "4.0.0-canary-6917",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,15 +33,15 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "4.0.0-canary-6912",
-    "@docusaurus/bundler": "4.0.0-canary-6912",
-    "@docusaurus/fs": "4.0.0-canary-6912",
-    "@docusaurus/glob": "4.0.0-canary-6912",
-    "@docusaurus/logger": "4.0.0-canary-6912",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6912",
-    "@docusaurus/utils": "4.0.0-canary-6912",
-    "@docusaurus/utils-common": "4.0.0-canary-6912",
-    "@docusaurus/utils-validation": "4.0.0-canary-6912",
+    "@docusaurus/babel": "4.0.0-canary-6917",
+    "@docusaurus/bundler": "4.0.0-canary-6917",
+    "@docusaurus/fs": "4.0.0-canary-6917",
+    "@docusaurus/glob": "4.0.0-canary-6917",
+    "@docusaurus/logger": "4.0.0-canary-6917",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6917",
+    "@docusaurus/utils": "4.0.0-canary-6917",
+    "@docusaurus/utils-common": "4.0.0-canary-6917",
+    "@docusaurus/utils-validation": "4.0.0-canary-6917",
     "@rspack/core": "^2.2.3",
     "@rspack/dev-server": "^2.2.1",
     "boxen": "^9.0.0",
@@ -74,8 +74,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6912",
-    "@docusaurus/types": "4.0.0-canary-6912",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6917",
+    "@docusaurus/types": "4.0.0-canary-6917",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/escape-html": "^1.0.4",
     "@types/history": "^4.7.11",
@@ -96,5 +96,5 @@
   "engines": {
     "node": ">=24.21"
   },
-  "gitHead": "0678e3df2754a88376515d4fc9cc9b03819d424d"
+  "gitHead": "ee71afc5cacf13c6198155e64c4c7ab89c0d7eef"
 }