@docusaurus/core 0.0.0-6068 → 0.0.0-6072

package/lib/server/configValidation.js

@@ -25,11 +25,13 @@ exports.DEFAULT_STORAGE_CONFIG = {
 exports.DEFAULT_FASTER_CONFIG = {
     swcJsLoader: false,
     swcJsMinimizer: false,
+    mdxCrossCompilerCache: false,
 };
 // When using the "faster: true" shortcut
 exports.DEFAULT_FASTER_CONFIG_TRUE = {
     swcJsLoader: true,
     swcJsMinimizer: true,
+    mdxCrossCompilerCache: true,
 };
 exports.DEFAULT_FUTURE_CONFIG = {
     experimental_faster: exports.DEFAULT_FASTER_CONFIG,
@@ -144,6 +146,7 @@ const FASTER_CONFIG_SCHEMA = utils_validation_1.Joi.alternatives()
     .try(utils_validation_1.Joi.object({
     swcJsLoader: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FASTER_CONFIG.swcJsLoader),
     swcJsMinimizer: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FASTER_CONFIG.swcJsMinimizer),
+    mdxCrossCompilerCache: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FASTER_CONFIG.mdxCrossCompilerCache),
 }), utils_validation_1.Joi.boolean()
     .required()
     .custom((bool) => bool ? exports.DEFAULT_FASTER_CONFIG_TRUE : exports.DEFAULT_FASTER_CONFIG))

package/lib/server/plugins/synthetic.js

@@ -60,6 +60,7 @@ function createBootstrapPlugin({ siteDir, siteConfig, }) {
  */
 async function createMDXFallbackPlugin({ siteDir, siteConfig, }) {
     const mdxLoaderItem = await (0, mdx_loader_1.createMDXLoaderItem)({
+        useCrossCompilerCache: siteConfig.future.experimental_faster.mdxCrossCompilerCache,
         admonitions: true,
         staticDirs: siteConfig.staticDirectories.map((dir) => path_1.default.resolve(siteDir, dir)),
         siteDir,

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

@@ -5,17 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { type Compiler } from 'webpack';
-/**
- * We modify webpack runtime to add an extra function called
- * "__webpack_require__.gca" that will allow us to get the corresponding chunk
- * asset for a webpack chunk. Pass it the chunkName or chunkId you want to load.
- * For example: if you have a chunk named "my-chunk-name" that will map to
- * "/publicPath/0a84b5e7.c8e35c7a.js" as its corresponding output path
- * __webpack_require__.gca("my-chunk-name") will return
- * "/publicPath/0a84b5e7.c8e35c7a.js"
- *
- * "gca" stands for "get chunk asset"
- */
 export default class ChunkAssetPlugin {
     apply(compiler: Compiler): void;
 }

package/lib/webpack/plugins/ChunkAssetPlugin.js

@@ -8,44 +8,57 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
-const pluginName = 'chunk-asset-plugin';
-/**
- * We modify webpack runtime to add an extra function called
- * "__webpack_require__.gca" that will allow us to get the corresponding chunk
- * asset for a webpack chunk. Pass it the chunkName or chunkId you want to load.
- * For example: if you have a chunk named "my-chunk-name" that will map to
- * "/publicPath/0a84b5e7.c8e35c7a.js" as its corresponding output path
- * __webpack_require__.gca("my-chunk-name") will return
- * "/publicPath/0a84b5e7.c8e35c7a.js"
- *
- * "gca" stands for "get chunk asset"
+// 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
+// Example: gca("814f3328") = "/baseUrl/assets/js/814f3328.03fcc178.js"
+// See also: https://github.com/facebook/docusaurus/pull/10485
+// The name of the custom Docusaurus Webpack runtime function
+const DocusaurusGetChunkAssetFn = '__webpack_require__.gca';
+const PluginName = 'Docusaurus-ChunkAssetPlugin';
+function generateGetChunkAssetRuntimeCode(chunk) {
+    const chunkIdToName = chunk.getChunkMaps(false).name;
+    const chunkNameToId = Object.fromEntries(Object.entries(chunkIdToName).map(([chunkId, chunkName]) => [
+        chunkName,
+        chunkId,
+    ]));
+    const { 
+    // publicPath = __webpack_require__.p
+    // Example: "/" or "/baseUrl/"
+    // https://github.com/webpack/webpack/blob/v5.94.0/lib/runtime/PublicPathRuntimeModule.js
+    publicPath, 
+    // 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;
+    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);
+}
+/*
+ Note: we previously used `MainTemplate.hooks.requireExtensions.tap()`
+ But it will be removed in Webpack 6 and is not supported by Rspack
+ So instead we use equivalent code inspired by:
+ - https://github.com/webpack/webpack/blob/v5.94.0/lib/RuntimePlugin.js#L462
+ - https://github.com/webpack/webpack/blob/v5.94.0/lib/runtime/CompatRuntimeModule.js
  */
 class ChunkAssetPlugin {
     apply(compiler) {
-        compiler.hooks.thisCompilation.tap(pluginName, ({ mainTemplate }) => {
-            mainTemplate.hooks.requireExtensions.tap(pluginName, (source, chunk) => {
-                const chunkIdToName = chunk.getChunkMaps(false).name;
-                const chunkNameToId = Object.fromEntries(Object.entries(chunkIdToName).map(([chunkId, chunkName]) => [
-                    chunkName,
-                    chunkId,
-                ]));
-                const buf = [source];
-                buf.push('// function to get chunk asset');
-                buf.push(
-                // If chunkName is passed, we convert it to chunk asset url
-                // .p => public path url ("/" or "/baseUrl/")
-                // .u(chunkId) =>
-                //   chunk asset url ("assets/js/x63b64xd.contentHash.js")
-                // not sure where this is documented, but this link was helpful:
-                // https://programmer.help/blogs/5d68849083e1a.html
-                //
-                // Note: __webpack_require__.gca() is called in docusaurus.ts for
-                // prefetching
-                // Note: we previously used jsonpScriptSrc (Webpack 4)
-                `__webpack_require__.gca = function(chunkId) { chunkId = ${JSON.stringify(chunkNameToId)}[chunkId]||chunkId; return __webpack_require__.p + __webpack_require__.u(chunkId); };`);
-                return webpack_1.default.Template.asString(buf);
+        compiler.hooks.thisCompilation.tap(PluginName, (compilation) => {
+            compilation.hooks.additionalTreeRuntimeRequirements.tap(PluginName, (chunk) => {
+                compilation.addRuntimeModule(chunk, new ChunkAssetRuntimeModule());
             });
         });
     }
 }
 exports.default = ChunkAssetPlugin;
+// Inspired by https://github.com/webpack/webpack/blob/v5.94.0/lib/runtime/CompatRuntimeModule.js
+class ChunkAssetRuntimeModule extends webpack_1.default.RuntimeModule {
+    constructor() {
+        super('ChunkAssetRuntimeModule', webpack_1.default.RuntimeModule.STAGE_ATTACH);
+        this.fullHash = true;
+    }
+    generate() {
+        return generateGetChunkAssetRuntimeCode(this.chunk);
+    }
+}

package/lib/webpack/server.js

@@ -33,8 +33,6 @@ async function createServerConfig(params) {
             path: outputDir,
             filename: outputFilename,
             libraryTarget: 'commonjs2',
-            // Workaround for Webpack 4 Bug (https://github.com/webpack/webpack/issues/6522)
-            globalObject: 'this',
         },
         plugins: [
             // Show compilation progress bar.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-6068",
+  "version": "0.0.0-6072",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,12 +43,12 @@
     "@babel/runtime": "^7.22.6",
     "@babel/runtime-corejs3": "^7.22.6",
     "@babel/traverse": "^7.22.8",
-    "@docusaurus/cssnano-preset": "0.0.0-6068",
-    "@docusaurus/logger": "0.0.0-6068",
-    "@docusaurus/mdx-loader": "0.0.0-6068",
-    "@docusaurus/utils": "0.0.0-6068",
-    "@docusaurus/utils-common": "0.0.0-6068",
-    "@docusaurus/utils-validation": "0.0.0-6068",
+    "@docusaurus/cssnano-preset": "0.0.0-6072",
+    "@docusaurus/logger": "0.0.0-6072",
+    "@docusaurus/mdx-loader": "0.0.0-6072",
+    "@docusaurus/utils": "0.0.0-6072",
+    "@docusaurus/utils-common": "0.0.0-6072",
+    "@docusaurus/utils-validation": "0.0.0-6072",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
     "babel-plugin-dynamic-import-node": "^2.3.3",
@@ -104,8 +104,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-6068",
-    "@docusaurus/types": "0.0.0-6068",
+    "@docusaurus/module-type-aliases": "0.0.0-6072",
+    "@docusaurus/types": "0.0.0-6072",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -132,5 +132,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "4f0bc982b589965d7238334bb9b5bf6c483cc35a"
+  "gitHead": "0489236d6e7d2912ca71b3b251d155e30bb8cd4d"
 }