Merge branch 'main' into nextjs

Author: ScriptedAlchemy

.changeset/beige-apricots-switch.md

@@ -0,0 +1,5 @@
+---
+'@module-federation/modern-js': patch
+---
+
+fix(modern-js-plugin): adjust fetch type

.changeset/early-tools-compete.md

@@ -1,5 +1,12 @@
 # @module-federation/modernjsapp
 
+## 0.1.99
+
+### Patch Changes
+
+- Updated dependencies [ad446af]
+  - @module-federation/enhanced@0.15.0
+
 ## 0.1.98
 
 ### Patch Changes

.changeset/rare-rockets-wink.md

@@ -1,7 +1,7 @@
 {
   "name": "@module-federation/modernjsapp",
   "private": true,
-  "version": "0.1.98",
+  "version": "0.1.99",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",

.changeset/rich-bees-applaud.md

@@ -1,5 +1,13 @@
 # remote5
 
+## 1.1.6
+
+### Patch Changes
+
+- Updated dependencies [f777710]
+  - @module-federation/rsbuild-plugin@0.15.0
+  - @module-federation/bridge-react@0.15.0
+
 ## 1.1.5
 
 ### Patch Changes

.changeset/silly-experts-begin.md

@@ -1,7 +1,7 @@
 {
   "name": "remote5",
   "private": true,
-  "version": "1.1.5",
+  "version": "1.1.6",
   "scripts": {
     "dev": "rsbuild dev",
     "build": "rsbuild build",

.changeset/slimy-horses-give.md

@@ -1,5 +1,11 @@
 # website-new
 
+## 1.1.6
+
+### Patch Changes
+
+- @module-federation/error-codes@0.15.0
+
 ## 1.1.5
 
 ### Patch Changes

.changeset/spotty-trains-stare.md

@@ -46,7 +46,7 @@ init({
       entry: "http://localhost:3006/remoteEntry.js",
       alias: "app2"
     },
-{
+    {
       name: "@demo/app4",
       entry: "http://localhost:3006/remoteEntry.mjs",
       alias: "app2",

.changeset/violet-boxes-happen.md

@@ -251,11 +251,13 @@ In CSR applications, the loader function executes in the browser, meaning they a
 In SSR applications, the loader function only executes on the server, meaning they are all Server Loaders by default. In SSR, Module Federation directly calls the corresponding loader function on the server. When switching routes in the browser, Module Federation sends an HTTP request to the SSR service, which also triggers the loader function on the server.
 
 :::note NOTE
+
 Having the loader function for SSR applications execute only on the server offers the following benefits:
 
 - Simplified usage: Ensures that data fetching in SSR applications is isomorphic, so developers don't need to differentiate loader function execution code based on the environment.
 - Reduced browser bundle size: Moves logic code and its dependencies from the browser to the server.
 - Improved maintainability: Moves logic code to the server, reducing the direct impact of data logic on the frontend UI. Additionally, it prevents accidental inclusion of server-side dependencies in the browser bundle or browser-side dependencies in the server bundle.
+
 :::
 
 #### Using Client Loader in SSR Applications
@@ -280,6 +282,7 @@ export async function loader({ params }) {
   }
 }
 ```
+
 :::warning WARNING
 To use a Client Loader, there must be a corresponding Server Loader, and the Server Loader must be defined using the `.data` file convention, not the `.loader` file convention.
 :::
@@ -483,7 +486,7 @@ export default Index;
 
 If the current project only needs to load MF in CSR, you can set `ssr: false` to help with progressive migration.
 
-```title='modern.config.ts'
+```ts title='modern.config.ts'
 import { appTools, defineConfig } from '@modern-js/app-tools';
 import { moduleFederationPlugin } from '@module-federation/modern-js';
 

.changeset/weak-spoons-begin.md

@@ -55,7 +55,7 @@ Modern.js also supports dependency management with `yarn` and `npm`.
 :::
 
 
-## 创建项目
+## Create Project
 
 `@modern-js/create` provides an interactive Q & A interface to initialize the project based on the results, with initialization performed according to the default settings:
 

apps/modernjs/CHANGELOG.md

@@ -169,7 +169,7 @@ cross-env NEXT_PRIVATE_LOCAL_WEBPACK=true next build
 
 `.env` can be set as well, but can be unreliable in setting `NEXT_PRIVATE_LOCAL_WEBPACK` in time.
 
-```.env title=".env"
+```ini title=".env"
 NEXT_PRIVATE_LOCAL_WEBPACK=true
 ```
 

apps/modernjs/package.json

@@ -252,11 +252,13 @@ loader 函数可能会在服务端或浏览器端执行。在服务端执行的
 在 SSR 应用中，loader 函数只会在服务端执行，即默认都是 Server Loader。在 SSR Module Federation 会直接在服务端调用对应的 loader 函数。在浏览器端切换路由时，Module Federation 会发送一个 http 请求到 SSR 服务，同样在服务端触发 loader 函数。
 
 :::note NOTE
+
 SSR 应用的 loader 函数只在服务端执行可以带来以下好处：
 
 简化使用方式：保证 SSR 应用获取数据的方式是同构的，开发者无需根据环境区分 loader 函数执行的代码。
 减少浏览器端 bundle 体积：将逻辑代码及其依赖，从浏览器端移动到了服务端。
 提高可维护性：将逻辑代码移动到服务端，减少了数据逻辑对前端 UI 的直接影响。此外，也避免了浏览器端 bundle 中误引入服务端依赖，或服务端 bundle 中误引入浏览器端依赖的问题。
+
 :::
 
 #### 在 SSR 应用中使用 Client Loader
@@ -282,7 +284,9 @@ export async function loader({ params }) {
 }
 ```
 :::warning WARNING
+
 要使用 Client Loader，必须有对应的 Server Loader，且 Server Loader 必须是 .data 文件约定，不能是 .loader 文件约定。
+
 :::
 
 ### FAQ
@@ -484,7 +488,7 @@ export default Index;
 
 如果当前项目仅需要在 CSR 加载 MF ，那么可以设置 `ssr: false` 来帮助渐进式迁移。
 
-```title='modern.config.ts'
+```ts title='modern.config.ts'
 import { appTools, defineConfig } from '@modern-js/app-tools';
 import { moduleFederationPlugin } from '@module-federation/modern-js';
 

apps/router-demo/router-remote5-2005/CHANGELOG.md

@@ -164,7 +164,7 @@ cross-env NEXT_PRIVATE_LOCAL_WEBPACK=true next build
 
 `.env` 也可以设置，但及时设置 `NEXT_PRIVATE_LOCAL_WEBPACK` 可能不可靠。
 
-```.env title=".env"
+```ini title=".env"
 NEXT_PRIVATE_LOCAL_WEBPACK=true
 ```
 

apps/router-demo/router-remote5-2005/package.json

@@ -1,6 +1,6 @@
 {
   "name": "website-new",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "private": true,
   "scripts": {
     "dev": "rspress dev",
@@ -9,12 +9,14 @@
   },
   "dependencies": {
     "framer-motion": "^10.0.0",
-    "rspress": "1.34.1",
+    "rspress": "2.0.0-beta.13",
     "tailwindcss": "^3.2.7",
     "video-react": "^0.16.0",
     "xgplayer": "^3.0.16",
     "rspress-plugin-annotation-words": "0.0.1",
-    "@module-federation/error-codes": "workspace:*"
+    "@rsbuild/plugin-sass": "^1.3.2",
+    "@module-federation/error-codes": "workspace:*",
+    "@rspress/plugin-llms": "2.0.0-beta.13"
   },
   "devDependencies": {
     "@types/node": "^20"

apps/website-new/CHANGELOG.md

@@ -2,6 +2,8 @@ import * as path from 'path';
 import { defineConfig } from 'rspress/config';
 import { moduleFederationPluginOverview } from './src/moduleFederationPluginOverview';
 import { pluginAnnotationWords } from 'rspress-plugin-annotation-words';
+import { pluginSass } from '@rsbuild/plugin-sass';
+import { pluginLlms } from '@rspress/plugin-llms';
 
 const getNavbar = (lang: string) => {
   const cn = lang === 'zh';
@@ -81,15 +83,16 @@ export default defineConfig({
     pluginAnnotationWords({
       wordsMapPath: 'words-map.json',
     }),
+    pluginLlms(),
   ],
   builderConfig: {
-    plugins: [moduleFederationPluginOverview],
+    plugins: [moduleFederationPluginOverview, pluginSass()],
     tools: {
       postcss: (config, { addPlugins }) => {
         addPlugins([require('tailwindcss/nesting'), require('tailwindcss')]);
       },
     },
-    source: {
+    resolve: {
       alias: {
         '@site': path.resolve(__dirname),
         '@components': path.join(__dirname, 'src/components'),

apps/website-new/docs/en/guide/basic/runtime.mdx

@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useLayoutEffect, useState } from 'react';
 import { useI18n } from '../../theme/i18n';
 import Player from 'xgplayer';
 import 'xgplayer/dist/index.min.css';
@@ -31,13 +31,17 @@ export default function AnnouncementVideo(props: {
     };
   }
 
-  const [divWidth, setDivWidth] = useState(window.innerWidth);
+  const [divWidth, setDivWidth] = useState(0);
 
   // 更新宽度的函数
   const updateWidth = () => {
     setDivWidth(window.innerWidth);
   };
 
+  useLayoutEffect(() => {
+    updateWidth();
+  }, []);
+
   useEffect(() => {
     window.addEventListener('resize', updateWidth);
 

apps/website-new/docs/en/guide/framework/modernjs.mdx

@@ -52,7 +52,7 @@ export function HomeFeature({ features }: { features: Feature[] }) {
                   }
                 }}
               >
-                <div className="flex-center">
+                <div className="flex justify-center items-center">
                   <div className="w-12 h-12 text-3xl text-center">{icon}</div>
                 </div>
                 <h2 className="font-bold text-center">{title}</h2>

apps/website-new/docs/en/practice/frameworks/modern/index.mdx

@@ -87,7 +87,7 @@ export function HomeFooter() {
           </div>
         ))}
       </div>
-      <div className="flex flex-center">
+      <div className="flex justify-center items-center">
         <h2 className="font-normal text-sm text-gray-600 dark:text-light-600 py-4">
           © {new Date().getFullYear()} Module Federation core team. All Rights
           Reserved.

apps/website-new/docs/en/practice/frameworks/next/index.mdx

@@ -50,17 +50,18 @@ export function HomeHero({ hero }: { hero: Hero }) {
                 <Button
                   className="pl-2 pr-2"
                   type="a"
-                  text={action.text}
                   href={normalizeHrefInRuntime(action.link)}
                   theme={action.theme}
-                />
+                >
+                  {action.text}
+                </Button>
               </div>
             ))}
           </div>
         </div>
 
         {hasImage ? (
-          <div className="modern-doc-home-hero-image m-auto flex-center md:none lg:flex order-1 md:order-2">
+          <div className="modern-doc-home-hero-image m-auto justify-center items-center md:none lg:flex order-1 md:order-2">
             <div className={styles.imgMask}></div>
             <img src="/svg.svg" alt={hero.image?.alt} />
           </div>

apps/website-new/docs/zh/guide/framework/modernjs.mdx

@@ -1,11 +1,5 @@
-import Theme from 'rspress/theme';
 import { HomeLayout } from './pages';
 import './index.css';
 
-// eslint-disable-next-line import/export
+export { HomeLayout };
 export * from 'rspress/theme';
-
-export default {
-  ...Theme,
-  HomeLayout,
-};

apps/website-new/docs/zh/practice/frameworks/next/index.mdx

@@ -1,5 +1,11 @@
 # @module-federation/bridge-react-webpack-plugin
 
+## 0.15.0
+
+### Patch Changes
+
+- @module-federation/sdk@0.15.0
+
 ## 0.14.3
 
 ### Patch Changes

apps/website-new/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/bridge-react-webpack-plugin",
-  "version": "0.14.3",
+  "version": "0.15.0",
   "publishConfig": {
     "access": "public"
   },

apps/website-new/rspress.config.ts

@@ -1,5 +1,12 @@
 # @module-federation/bridge-react
 
+## 0.15.0
+
+### Patch Changes
+
+- @module-federation/sdk@0.15.0
+- @module-federation/bridge-shared@0.15.0
+
 ## 0.14.3
 
 ### Patch Changes

apps/website-new/src/components/AnnouncementVideo.tsx

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/bridge-react",
-  "version": "0.14.3",
+  "version": "0.15.0",
   "publishConfig": {
     "access": "public"
   },

apps/website-new/theme/components/HomeFeature/index.tsx

@@ -1,5 +1,7 @@
 # @module-federation/bridge-shared
 
+## 0.15.0
+
 ## 0.14.3
 
 ## 0.14.2

apps/website-new/theme/components/HomeFooter/index.tsx

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/bridge-shared",
-  "version": "0.14.3",
+  "version": "0.15.0",
   "publishConfig": {
     "access": "public"
   },