Merge branch 'main' into schema-precompile

module-federation · Jan 28, 2025 · 8173ea8 · 8173ea8
2 parents 82fc6e0 + f141396
commit 8173ea8
Show file tree

Hide file tree

Showing 24 changed files with 1,861 additions and 1,537 deletions.
diff --git a/.changeset/afraid-planets-juggle.md b/.changeset/afraid-planets-juggle.md
@@ -0,0 +1,5 @@
+---
+'@module-federation/bridge-vue3': patch
+---
+
+fix(vue3-bridge): bridge-vue3 parameter lossing issue
diff --git a/.changeset/bright-planets-boil.md b/.changeset/bright-planets-boil.md
@@ -0,0 +1,5 @@
+---
+'@module-federation/modern-js': patch
+---
+
+chore: use new modern.js plugin for improved functionality
diff --git a/apps/modernjs-ssr/dynamic-nested-remote/package.json b/apps/modernjs-ssr/dynamic-nested-remote/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.26.0",
-    "@modern-js/runtime": "2.60.6",
+    "@modern-js/runtime": "2.64.0",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.6",
+    "@modern-js/app-tools": "2.64.0",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.6",
+    "@modern-js/tsconfig": "2.64.0",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/dynamic-remote-new-version/package.json b/apps/modernjs-ssr/dynamic-remote-new-version/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.26.0",
-    "@modern-js/runtime": "2.60.6",
+    "@modern-js/runtime": "2.64.0",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.6",
+    "@modern-js/app-tools": "2.64.0",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.6",
+    "@modern-js/tsconfig": "2.64.0",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/dynamic-remote/package.json b/apps/modernjs-ssr/dynamic-remote/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.26.0",
-    "@modern-js/runtime": "2.60.6",
+    "@modern-js/runtime": "2.64.0",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.6",
+    "@modern-js/app-tools": "2.64.0",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.6",
+    "@modern-js/tsconfig": "2.64.0",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/host/package.json b/apps/modernjs-ssr/host/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.26.0",
-    "@modern-js/runtime": "2.60.6",
+    "@modern-js/runtime": "2.64.0",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.6",
+    "@modern-js/app-tools": "2.64.0",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.6",
+    "@modern-js/tsconfig": "2.64.0",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/nested-remote/package.json b/apps/modernjs-ssr/nested-remote/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.26.0",
-    "@modern-js/runtime": "2.60.6",
+    "@modern-js/runtime": "2.64.0",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.6",
+    "@modern-js/app-tools": "2.64.0",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.6",
+    "@modern-js/tsconfig": "2.64.0",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/remote-new-version/package.json b/apps/modernjs-ssr/remote-new-version/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.26.0",
-    "@modern-js/runtime": "2.60.6",
+    "@modern-js/runtime": "2.64.0",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.6",
+    "@modern-js/app-tools": "2.64.0",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.6",
+    "@modern-js/tsconfig": "2.64.0",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/remote/package.json b/apps/modernjs-ssr/remote/package.json
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.26.0",
-    "@modern-js/runtime": "2.60.6",
+    "@modern-js/runtime": "2.64.0",
     "@module-federation/modern-js": "workspace:*",
     "antd": "4.24.15",
     "react": "~18.3.1",
     "react-dom": "~18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.6",
+    "@modern-js/app-tools": "2.64.0",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.6",
+    "@modern-js/tsconfig": "2.64.0",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs/package.json b/apps/modernjs/package.json
@@ -26,16 +26,16 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.26.0",
-    "@modern-js/runtime": "2.60.6",
+    "@modern-js/runtime": "2.64.0",
     "@module-federation/enhanced": "workspace:*",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },
   "devDependencies": {
     "@modern-js-app/eslint-config": "2.59.0",
-    "@modern-js/app-tools": "2.60.6",
+    "@modern-js/app-tools": "2.64.0",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.6",
+    "@modern-js/tsconfig": "2.64.0",
     "@types/jest": "~29.5.0",
     "@types/node": "~20.12.12",
     "@types/react": "~18.2.0",

diff --git a/apps/router-demo/router-host-2000/src/App.tsx b/apps/router-demo/router-host-2000/src/App.tsx
@@ -135,7 +135,7 @@ const App = () => {
           path="/remote2/*"
           Component={() => <Remote2App style={{ padding: '20px' }} />}
         />
-        <Route path="/remote3/*" Component={() => <Remote3App />} />
+        <Route path="/remote3/*" Component={() => <Remote3App test="123" />} />
         <Route path="/memory-router/*" Component={() => <Wraper3 />} />
         <Route
           path="/remote-render-error/*"

diff --git a/apps/router-demo/router-remote3-2003/src/App.vue b/apps/router-demo/router-remote3-2003/src/App.vue
@@ -11,3 +11,12 @@
 </template>
 
 <style scoped></style>
+
+<script lang="ts" setup>
+interface Props {
+  test?: string;
+}
+
+const props = defineProps<Props>();
+console.log('props', props);
+</script>
diff --git a/apps/router-demo/router-remote3-2003/src/export-app.ts b/apps/router-demo/router-remote3-2003/src/export-app.ts
@@ -1,12 +1,13 @@
-import { createApp } from 'vue';
 import App from './App.vue';
-import './index.css';
 import router from './router';
 import { createBridgeComponent } from '@module-federation/bridge-vue3';
+import './index.css';
 
 export default createBridgeComponent({
   rootComponent: App,
-  appOptions: () => ({
-    router,
-  }),
+  appOptions: ({ app }) => {
+    // Optional: adding a plugin to the new Vue instance on the host application side
+    // app.use(customPlugin);
+    return { router };
+  },
 });
diff --git a/apps/website-new/docs/en/practice/bridge/react-bridge.mdx b/apps/website-new/docs/en/practice/bridge/react-bridge.mdx
@@ -1,7 +1,5 @@
 # React Bridge
 
-# React Bridge
-
 `@module-federation/bridge-react` provides bridge utility functions for React applications:
 - `createBridgeComponent`: Used for exporting application-level modules, suitable for producers to wrap modules exported as application types.
 - `createRemoteComponent`: Used for loading application-level modules, suitable for consumers to load modules as application types.

diff --git a/apps/website-new/docs/en/practice/bridge/vue-bridge.mdx b/apps/website-new/docs/en/practice/bridge/vue-bridge.mdx
@@ -1,7 +1,6 @@
+# Vue Bridge (for Vue v3)
 
-## Vue Bridge (for Vue v3)
-
-`@module-federation/bridge-vue3` provides a `bridge` utility function for Vue v3 applications. The provided `createBridgeComponent` can be used to export application-level modules, and `createRemoteComponent` can be used to load application-level modules.
+`@module-federation/bridge-vue3` provides a `bridge` utility function for Vue V3 applications. The provided `createBridgeComponent` can be used to export application-level modules, and `createRemoteComponent` can be used to load application-level modules.
 
 ### Installation
 
@@ -71,9 +70,8 @@ export default createBridgeComponent({
   rootComponent: App,
   appOptions: ({app}) => {
     // Optional: adding a plugin to the new Vue instance on the host application side
-    app.use(customPlugin)
-
-    return {router}
+    app.use(customPlugin);
+    return { router };
   },
 });
 ```
@@ -242,8 +240,7 @@ export default createBridgeComponent({
   appOptions: ({app}) => {
     // Optional: adding a plugin to the new Vue instance on the host application side
     app.use(customPlugin)
-
-    return {router}
+    return { router };
   },
 });
 ```