@module-federation/rspress-plugin 0.23.0 → 0.24.0

package/dist/{esm/index.js → index.js}

@@ -1,17 +1,17 @@
-import external_path_default from "path";
-import external_fs_extra_default from "fs-extra";
 import { pluginModuleFederation } from "@module-federation/rsbuild-plugin";
 import { BUILD_002, buildDescMap, getShortErrorMsg } from "@module-federation/error-codes";
 import { createLogger, createModuleFederationConfig } from "@module-federation/sdk";
 import promises_default from "node:fs/promises";
 import external_node_path_default from "node:path";
+import "node:crypto";
 import { load } from "cheerio";
 import { htmlToText } from "html-to-text";
 import { groupBy } from "lodash-es";
+import { SEARCH_INDEX_NAME } from "@rspress/shared";
+import external_path_default from "path";
 import external_fs_default from "fs";
 const logger = createLogger('[ Module Federation Rspress Plugin ]');
 const src_logger = logger;
-const SEARCH_INDEX_NAME = 'search_index';
 function findSearchIndexPaths(outputDir) {
     const staticDir = external_path_default.join(outputDir, 'static');
     if (!external_fs_default.existsSync(staticDir)) return;
@@ -44,16 +44,14 @@ function generateTocFromHtml(html) {
 const replaceHtmlExt = (filepath)=>filepath.replace(external_node_path_default.extname(filepath), '.html');
 async function extractPageDataFromHtml(routes, options) {
     return Promise.all(routes.map(async (route)=>{
-        const { domain, searchCodeBlocks, outputDir, defaultLang } = options;
+        const { searchCodeBlocks, outputDir, defaultLang } = options;
         const defaultIndexInfo = {
             title: '',
             content: '',
-            _html: '',
             _flattenContent: '',
             routePath: route.routePath,
             lang: route.lang,
             toc: [],
-            domain,
             frontmatter: {},
             version: route.version,
             _filepath: route.absolutePath,
@@ -116,8 +114,7 @@ async function extractPageDataFromHtml(routes, options) {
             ...defaultIndexInfo,
             title,
             toc,
-            content,
-            _html: html
+            content
         };
     }));
 }
@@ -158,48 +155,6 @@ async function rebuildSearchIndexByHtml(routes, options) {
     }));
 }
 const isDev = ()=>'development' === process.env.NODE_ENV;
-function replaceEntryWithBootstrapEntry(bundlerConfig) {
-    const { entry } = bundlerConfig;
-    if (!entry) {
-        src_logger.error('No entry found!');
-        process.exit(1);
-    }
-    if ('function' == typeof entry) {
-        src_logger.error('Not support entry function!');
-        process.exit(1);
-    }
-    const replaceWithAsyncEntry = (entries, entryName)=>{
-        const entryPath = external_path_default.resolve(process.cwd(), `node_modules/.federation/${entryName}-bootstrap.js`);
-        external_fs_extra_default.ensureDirSync(external_path_default.dirname(entryPath));
-        if ('string' == typeof entries) {
-            external_fs_extra_default.writeFileSync(entryPath, `const entry = import ('${entries}');
-      const render = entry.then(({render})=>(render));
-      const routes = entry.then(({routes})=>(routes));
-      export {
-          render,
-          routes
-        };`);
-            return entryPath;
-        }
-        external_fs_extra_default.writeFileSync(entryPath, `const entry = import ('${entries.slice(-1)[0]}');
-         const render = entry.then(({render})=>(render));
-      const routes = entry.then(({routes})=>(routes));
-      export {
-          render,
-          routes
-        };`);
-        return entries.slice(0, -1).concat(entryPath);
-    };
-    if ('object' == typeof entry && !Array.isArray(entry)) return void Object.keys(entry).forEach((entryName)=>{
-        const entryValue = entry[entryName];
-        if (!Array.isArray(entryValue)) {
-            src_logger.error(`Not support entry ${typeof entryValue}!`);
-            process.exit(1);
-        }
-        entry[entryName] = replaceWithAsyncEntry(entryValue, `${entryName}${bundlerConfig.name ? `-${bundlerConfig.name}` : ''}`);
-    });
-    bundlerConfig.entry = replaceWithAsyncEntry(entry, bundlerConfig.name || 'index');
-}
 function plugin_pluginModuleFederation(mfConfig, rspressOptions) {
     const { autoShared = true, rebuildSearchIndex = true } = rspressOptions || {};
     if (autoShared) mfConfig.shared = {
@@ -223,12 +178,14 @@ function plugin_pluginModuleFederation(mfConfig, rspressOptions) {
             singleton: true,
             requiredVersion: false
         },
-        '@rspress/runtime': {
+        '@rspress/core/runtime': {
             singleton: true,
             requiredVersion: false
         },
         ...mfConfig.shared
     };
+    mfConfig.experiments ||= {};
+    mfConfig.experiments.asyncStartup = true;
     let enableSSG = false;
     let outputDir = '';
     let routes = [];
@@ -237,11 +194,6 @@ function plugin_pluginModuleFederation(mfConfig, rspressOptions) {
         async config (config) {
             if (!isDev() && false !== config.ssg) enableSSG = true;
             config.builderConfig ||= {};
-            config.builderConfig.dev ||= {};
-            if (isDev() && void 0 === config.builderConfig.dev.lazyCompilation) {
-                src_logger.warn('lazyCompilation is not fully supported for module federation, set lazyCompilation to false');
-                config.builderConfig.dev.lazyCompilation = false;
-            }
             config.builderConfig.plugins ||= [];
             config.builderConfig.plugins.push(pluginModuleFederation(mfConfig, {
                 target: enableSSG ? 'dual' : 'web',
@@ -254,7 +206,6 @@ function plugin_pluginModuleFederation(mfConfig, rspressOptions) {
             plugins: [],
             tools: {
                 rspack (config) {
-                    replaceEntryWithBootstrapEntry(config);
                     if ('node' === config.name) {
                         if (('/' === config.output.publicPath || 'auto' === config.output.publicPath) && mfConfig.exposes) {
                             src_logger.error(getShortErrorMsg(BUILD_002, buildDescMap, {
@@ -278,8 +229,8 @@ function plugin_pluginModuleFederation(mfConfig, rspressOptions) {
             }
             const searchConfig = config?.search || {};
             const replaceRules = config?.replaceRules || [];
-            const domain = searchConfig?.mode === 'remote' ? searchConfig.domain ?? '' : '';
-            const versioned = searchConfig && 'remote' !== searchConfig.mode && searchConfig.versioned;
+            const domain = '';
+            const versioned = searchConfig && searchConfig.versioned;
             const searchCodeBlocks = 'codeBlocks' in searchConfig ? Boolean(searchConfig.codeBlocks) : true;
             await rebuildSearchIndexByHtml(routes, {
                 outputDir,

package/dist/{esm/packages/rspress-plugin/src/plugin.d.ts → plugin.d.ts}

@@ -1,5 +1,5 @@
 import type { moduleFederationPlugin } from '@module-federation/sdk';
-import type { RspressPlugin } from '@rspress/shared';
+import type { RspressPlugin } from '@rspress/core';
 type RspressPluginOptions = {
     autoShared?: boolean;
     rebuildSearchIndex?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/rspress-plugin",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "type": "module",
   "description": "Module Federation plugin for Rspress",
   "keywords": [
@@ -23,15 +23,15 @@
   "author": "hanric <hanric.zhang@gmail.com>",
   "exports": {
     ".": {
-      "types": "./dist/esm/packages/rspress-plugin/src/plugin.d.ts",
-      "import": "./dist/esm/index.js"
+      "types": "./dist/plugin.d.ts",
+      "import": "./dist/index.js"
     }
   },
-  "module": "./dist/esm/index.js",
-  "types": "./dist/esm/packages/rspress-plugin/src/plugin.d.ts",
+  "module": "./dist/index.js",
+  "types": "./dist/plugin.d.ts",
   "devDependencies": {
     "@rslib/core": "^0.9.2",
-    "@rspress/shared": "2.0.0-beta.16",
+    "@rspress/core": "2.0.1",
     "@types/html-to-text": "^9.0.4",
     "@types/lodash-es": "^4.17.12",
     "@types/react": "^18.3.11"
@@ -41,14 +41,17 @@
     "fs-extra": "11.3.0",
     "html-to-text": "^9.0.5",
     "lodash-es": "^4.17.21",
-    "@module-federation/enhanced": "0.23.0",
-    "@module-federation/rsbuild-plugin": "0.23.0",
-    "@module-federation/sdk": "0.23.0",
-    "@module-federation/error-codes": "0.23.0"
+    "@rspress/shared": "2.0.1",
+    "@module-federation/sdk": "0.24.0",
+    "@module-federation/enhanced": "0.24.0",
+    "@module-federation/rsbuild-plugin": "0.24.0",
+    "@module-federation/error-codes": "0.24.0"
+  },
+  "peerDependencies": {
+    "@rspress/core": "^2.0.1"
   },
   "scripts": {
     "build": "rslib build",
-    "dev": "rslib mf-dev",
     "build:watch": "rslib build --watch"
   }
 }