@docusaurus/core 0.0.0-6100 → 0.0.0-6101

package/lib/commands/build.js

@@ -101,7 +101,7 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
     const router = siteConfig.future.experimental_router;
     const configureWebpackUtils = await (0, configure_1.createConfigureWebpackUtils)({ siteConfig });
     // We can build the 2 configs in parallel
-    const [{ clientConfig, clientManifestPath }, { serverConfig, serverBundlePath }] = await logger_1.PerfLogger.async('Creating bundler configs', () => Promise.all([
+    const [{ clientConfig, clientManifestPath }, { serverConfig, serverBundlePath }] = await logger_1.PerfLogger.async(`Creating ${props.currentBundler.name} bundler configs`, () => Promise.all([
         getBuildClientConfig({
             props,
             cliOptions,
@@ -113,7 +113,7 @@ async function buildLocale({ siteDir, locale, cliOptions, }) {
         }),
     ]));
     // Run webpack to build JS bundle (client) and static html files (server).
-    await logger_1.PerfLogger.async(`Bundling with ${configureWebpackUtils.currentBundler.name}`, () => {
+    await logger_1.PerfLogger.async(`Bundling with ${props.currentBundler.name}`, () => {
         return (0, bundler_1.compile)({
             configs: 
             // For hash router we don't do SSG and can skip the server bundle

package/lib/commands/start/webpack.js

@@ -10,7 +10,6 @@ exports.createWebpackDevServer = createWebpackDevServer;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
-const webpack_1 = tslib_1.__importDefault(require("webpack"));
 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"));
@@ -125,7 +124,7 @@ async function createWebpackDevServer({ props, cliOptions, openUrlContext, }) {
         poll: cliOptions.poll,
         configureWebpackUtils,
     });
-    const compiler = (0, webpack_1.default)(config);
+    const compiler = props.currentBundler.instance(config);
     registerWebpackE2ETestHook(compiler);
     const defaultDevServerConfig = await createDevServerConfig({
         cliOptions,

package/lib/webpack/base.js

@@ -54,10 +54,14 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
     const CSSExtractPlugin = await (0, bundler_1.getCSSExtractPlugin)({
         currentBundler: props.currentBundler,
     });
-    return {
-        mode,
-        name,
-        cache: {
+    function getCache() {
+        if (props.currentBundler.name === 'rspack') {
+            // TODO Rspack only supports memory cache (as of Sept 2024)
+            // TODO re-enable file persistent cache one Rspack supports it
+            //  See also https://rspack.dev/config/cache#cache
+            return undefined;
+        }
+        return {
             type: 'filesystem',
             // Can we share the same cache across locales?
             // Exploring that question at https://github.com/webpack/webpack/issues/13034
@@ -83,7 +87,12 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
                     siteConfigPath,
                 ],
             },
-        },
+        };
+    }
+    return {
+        mode,
+        name,
+        cache: getCache(),
         output: {
             pathinfo: false,
             path: outDir,
@@ -100,7 +109,6 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
         },
         devtool: isProd ? undefined : 'eval-cheap-module-source-map',
         resolve: {
-            unsafeCache: false, // Not enabled, does not seem to improve perf much
             extensions: ['.wasm', '.mjs', '.js', '.jsx', '.ts', '.tsx', '.json'],
             symlinks: true, // See https://github.com/facebook/docusaurus/issues/3272
             roots: [

package/lib/webpack/client.js

@@ -29,7 +29,7 @@ async function createBaseClientConfig({ props, hydrate, minify, faster, configur
         configureWebpackUtils,
     });
     const ProgressBarPlugin = await (0, bundler_1.getProgressBarPlugin)({
-        currentBundler: configureWebpackUtils.currentBundler,
+        currentBundler: props.currentBundler,
     });
     return (0, webpack_merge_1.default)(baseConfig, {
         // Useless, disabled on purpose (errors on existing sites with no

package/lib/webpack/plugins/ChunkAssetPlugin.js

@@ -53,6 +53,8 @@ class ChunkAssetPlugin {
 }
 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);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-6100",
+  "version": "0.0.0-6101",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,13 +33,13 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "0.0.0-6100",
-    "@docusaurus/bundler": "0.0.0-6100",
-    "@docusaurus/logger": "0.0.0-6100",
-    "@docusaurus/mdx-loader": "0.0.0-6100",
-    "@docusaurus/utils": "0.0.0-6100",
-    "@docusaurus/utils-common": "0.0.0-6100",
-    "@docusaurus/utils-validation": "0.0.0-6100",
+    "@docusaurus/babel": "0.0.0-6101",
+    "@docusaurus/bundler": "0.0.0-6101",
+    "@docusaurus/logger": "0.0.0-6101",
+    "@docusaurus/mdx-loader": "0.0.0-6101",
+    "@docusaurus/utils": "0.0.0-6101",
+    "@docusaurus/utils-common": "0.0.0-6101",
+    "@docusaurus/utils-validation": "0.0.0-6101",
     "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": "0.0.0-6100",
-    "@docusaurus/types": "0.0.0-6100",
+    "@docusaurus/module-type-aliases": "0.0.0-6101",
+    "@docusaurus/types": "0.0.0-6101",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -100,5 +100,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "46fbfd180de4cef70d17a2ef4db047810a2f0381"
+  "gitHead": "16bade8e806ebfd77603c2e52d06a0208843122e"
 }