chore: merge main branch

module-federation · Sep 19, 2024 · b02d9f0 · b02d9f0
2 parents b47ea80 + 5447f80
commit b02d9f0
Show file tree

Hide file tree

Showing 145 changed files with 6,372 additions and 4,859 deletions.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -20,7 +20,8 @@
       "@module-federation/bridge-shared",
       "@module-federation/bridge-react-webpack-plugin",
       "@module-federation/modern-js",
-      "@module-federation/retry-plugin"
+      "@module-federation/retry-plugin",
+      "@module-federation/data-prefetch"
     ]
   ],
   "ignorePatterns": ["^alpha|^beta"],

diff --git a/.github/workflows/e2e-manifest.yml b/.github/workflows/e2e-manifest.yml
@@ -43,4 +43,4 @@ jobs:
 
       - name: E2E Test for Manifest Demo
         if: steps.check-ci.outcome == 'success'
-        run: pnpm run app:manifest:dev & echo "done" && npx wait-on tcp:3009 && npx wait-on tcp:3012 && npx nx run-many --target=e2e --projects=manifest-webpack-host --parallel=1 && npx kill-port 3013 3009 3010 3011 3012
+        run: pnpm run app:manifest:dev & echo "done" && npx wait-on tcp:3009 && npx wait-on tcp:3012 && npx wait-on http://127.0.0.1:4001/ && npx nx run-many --target=e2e --projects=manifest-webpack-host --parallel=1 && npx kill-port 3013 3009 3010 3011 3012 4001
diff --git a/apps/manifest-demo/3009-webpack-provider/tsconfig.app.json b/apps/manifest-demo/3009-webpack-provider/tsconfig.app.json
@@ -1,6 +1,16 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
+    "jsx": "react-jsx",
+    "allowJs": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
     "outDir": "../../../dist/out-tsc",
     "types": [
       "node",

diff --git a/apps/manifest-demo/3009-webpack-provider/tsconfig.json b/apps/manifest-demo/3009-webpack-provider/tsconfig.json
@@ -10,12 +10,29 @@
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "outDir": "../../../dist/out-tsc",
+    "types": [
+      "node",
+      "@nx/react/typings/cssmodule.d.ts",
+      "@nx/react/typings/image.d.ts"
+    ]
   },
-  "files": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    }
-  ]
+  "files": [
+    "../../../node_modules/@nx/react/typings/cssmodule.d.ts",
+    "../../../node_modules/@nx/react/typings/image.d.ts"
+  ],
+  "exclude": [
+    "jest.config.ts",
+    "**/*.spec.ts",
+    "**/*.test.ts",
+    "**/*.spec.tsx",
+    "**/*.test.tsx",
+    "**/*.spec.js",
+    "**/*.test.js",
+    "**/*.spec.jsx",
+    "**/*.test.jsx",
+    "dist/**"
+  ],
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
 }
diff --git a/apps/manifest-demo/3010-rspack-provider/package.json b/apps/manifest-demo/3010-rspack-provider/package.json
@@ -9,6 +9,7 @@
     "@rspack/plugin-react-refresh": "0.5.9"
   },
   "dependencies": {
-    "antd": "4.24.15"
+    "antd": "4.24.15",
+    "react-router-dom": "^6.23.1"
   }
 }
diff --git a/apps/manifest-demo/3010-rspack-provider/rspack.config.js b/apps/manifest-demo/3010-rspack-provider/rspack.config.js
@@ -66,6 +66,7 @@ module.exports = composePlugins(
           'react-dom': {},
           'react-dom/': {},
         },
+        dataPrefetch: true,
       }),
     );
     (config.devServer = {

diff --git a/apps/manifest-demo/3010-rspack-provider/src/App.tsx b/apps/manifest-demo/3010-rspack-provider/src/App.tsx
@@ -1,4 +1,6 @@
 import LocalButton from './Button';
+import { Await } from 'react-router-dom';
+console.log(Await);
 
 const App = () => (
   <div>

diff --git a/apps/manifest-demo/webpack-host/src/App.tsx b/apps/manifest-demo/webpack-host/src/App.tsx
@@ -1,4 +1,6 @@
 import React, { Suspense, lazy } from 'react';
+// @ts-ignore
+import ReactComponent from 'modern-js-provider/react-component';
 import TestRemoteHook from './test-remote-hook';
 import { loadRemote } from '@module-federation/runtime';
 import LocalBtn from './components/ButtonOldAnt';
@@ -29,6 +31,7 @@ const WebpackPngRemote = lazy(() => import('remote1/WebpackPng'));
 
 const App = () => (
   <div>
+    <ReactComponent />
     <h2>Manifest Basic Usage</h2>
     <h3>check static remote</h3>
     <table border={1} cellPadding={5}>

diff --git a/apps/manifest-demo/webpack-host/webpack.config.js b/apps/manifest-demo/webpack-host/webpack.config.js
@@ -20,6 +20,7 @@ module.exports = composePlugins(withNx(), withReact(), (config, context) => {
           'rspack_manifest_provider@http://localhost:3011/mf-manifest.json',
         'js-entry-provider':
           'rspack_js_entry_provider@http://localhost:3012/remoteEntry.js',
+        'modern-js-provider': 'app1@http://127.0.0.1:4001/mf-manifest.json',
       },
       filename: 'remoteEntry.js',
       exposes: {

diff --git a/apps/modernjs-ssr/dynamic-nested-remote/CHANGELOG.md b/apps/modernjs-ssr/dynamic-nested-remote/CHANGELOG.md
@@ -1,5 +1,17 @@
 # modernjs-ssr-dynamic-nested-remote
 
+## 0.1.26
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.6
+
+## 0.1.25
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.5
+
 ## 0.1.24
 
 ### Patch Changes

diff --git a/apps/modernjs-ssr/dynamic-nested-remote/package.json b/apps/modernjs-ssr/dynamic-nested-remote/package.json
@@ -1,7 +1,7 @@
 {
   "name": "modernjs-ssr-dynamic-nested-remote",
   "private": true,
-  "version": "0.1.24",
+  "version": "0.1.26",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",

diff --git a/apps/modernjs-ssr/dynamic-remote-new-version/CHANGELOG.md b/apps/modernjs-ssr/dynamic-remote-new-version/CHANGELOG.md
@@ -1,5 +1,17 @@
 # modernjs-ssr-dynamic-remote-new-version
 
+## 0.1.26
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.6
+
+## 0.1.25
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.5
+
 ## 0.1.24
 
 ### Patch Changes

diff --git a/apps/modernjs-ssr/dynamic-remote-new-version/package.json b/apps/modernjs-ssr/dynamic-remote-new-version/package.json
@@ -1,7 +1,7 @@
 {
   "name": "modernjs-ssr-dynamic-remote-new-version",
   "private": true,
-  "version": "0.1.24",
+  "version": "0.1.26",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",

diff --git a/apps/modernjs-ssr/dynamic-remote/CHANGELOG.md b/apps/modernjs-ssr/dynamic-remote/CHANGELOG.md
@@ -1,5 +1,17 @@
 # modernjs-ssr-dynamic-remote
 
+## 0.1.26
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.6
+
+## 0.1.25
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.5
+
 ## 0.1.24
 
 ### Patch Changes

diff --git a/apps/modernjs-ssr/dynamic-remote/package.json b/apps/modernjs-ssr/dynamic-remote/package.json
@@ -1,7 +1,7 @@
 {
   "name": "modernjs-ssr-dynamic-remote",
   "private": true,
-  "version": "0.1.24",
+  "version": "0.1.26",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",

diff --git a/apps/modernjs-ssr/host/CHANGELOG.md b/apps/modernjs-ssr/host/CHANGELOG.md
@@ -1,5 +1,17 @@
 # modernjs-ssr-host
 
+## 0.1.26
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.6
+
+## 0.1.25
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.5
+
 ## 0.1.24
 
 ### Patch Changes

diff --git a/apps/modernjs-ssr/host/package.json b/apps/modernjs-ssr/host/package.json
@@ -1,7 +1,7 @@
 {
   "name": "modernjs-ssr-host",
   "private": true,
-  "version": "0.1.24",
+  "version": "0.1.26",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",

diff --git a/apps/modernjs-ssr/nested-remote/CHANGELOG.md b/apps/modernjs-ssr/nested-remote/CHANGELOG.md
@@ -1,5 +1,17 @@
 # modernjs-ssr-nested-remote
 
+## 0.1.26
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.6
+
+## 0.1.25
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.5
+
 ## 0.1.24
 
 ### Patch Changes

diff --git a/apps/modernjs-ssr/nested-remote/package.json b/apps/modernjs-ssr/nested-remote/package.json
@@ -1,7 +1,7 @@
 {
   "name": "modernjs-ssr-nested-remote",
   "private": true,
-  "version": "0.1.24",
+  "version": "0.1.26",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",

diff --git a/apps/modernjs-ssr/remote-new-version/CHANGELOG.md b/apps/modernjs-ssr/remote-new-version/CHANGELOG.md
@@ -1,5 +1,17 @@
 # modernjs-ssr-remote-new-version
 
+## 0.1.28
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.6
+
+## 0.1.27
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.5
+
 ## 0.1.26
 
 ### Patch Changes

diff --git a/apps/modernjs-ssr/remote-new-version/package.json b/apps/modernjs-ssr/remote-new-version/package.json
@@ -1,7 +1,7 @@
 {
   "name": "modernjs-ssr-remote-new-version",
   "private": true,
-  "version": "0.1.26",
+  "version": "0.1.28",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",

diff --git a/apps/modernjs-ssr/remote/CHANGELOG.md b/apps/modernjs-ssr/remote/CHANGELOG.md
@@ -1,5 +1,17 @@
 # modernjs-ssr-remote
 
+## 0.1.28
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.6
+
+## 0.1.27
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.5
+
 ## 0.1.26
 
 ### Patch Changes

diff --git a/apps/modernjs-ssr/remote/package.json b/apps/modernjs-ssr/remote/package.json
@@ -1,7 +1,7 @@
 {
   "name": "modernjs-ssr-remote",
   "private": true,
-  "version": "0.1.26",
+  "version": "0.1.28",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",

diff --git a/apps/modernjs/CHANGELOG.md b/apps/modernjs/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @module-federation/modernjs
 
+## 0.1.52
+
+### Patch Changes
+
+- @module-federation/enhanced@0.6.6
+
+## 0.1.51
+
+### Patch Changes
+
+- @module-federation/enhanced@0.6.5
+
 ## 0.1.50
 
 ### Patch Changes

diff --git a/apps/modernjs/cypress/e2e/app.cy.ts b/apps/modernjs/cypress/e2e/app.cy.ts
@@ -3,7 +3,7 @@ describe('modernjs/', () => {
 
   describe('Welcome message', () => {
     it('should display welcome message', () => {
-      cy.get('.title').contains('Welcome');
+      cy.get('.container-box').contains('Resend request with parameters');
     });
   });
 });
diff --git a/apps/modernjs/modern.config.ts b/apps/modernjs/modern.config.ts
@@ -32,7 +32,8 @@ export default defineConfig({
     },
     webpack: (config, { webpack, appendPlugins }) => {
       if (config?.output) {
-        config.output.publicPath = 'http://localhost:4001/';
+        config.output.publicPath = 'http://127.0.0.1:4001/';
+        config.output.uniqueName = 'modern-js-app1';
       }
 
       appendPlugins([
@@ -44,12 +45,14 @@ export default defineConfig({
           name: 'app1',
           exposes: {
             './thing': './src/test.ts',
+            './react-component': './src/components/react-component.tsx',
           },
           runtimePlugins: ['./runtimePlugin.ts'],
           shared: {
             react: { singleton: true },
             'react-dom': { singleton: true },
           },
+          dataPrefetch: true,
         }),
       ]);
     },

diff --git a/apps/modernjs/package.json b/apps/modernjs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@module-federation/modernjs",
   "private": true,
-  "version": "0.1.50",
+  "version": "0.1.52",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",

diff --git a/apps/modernjs/src/components/react-component.prefetch.ts b/apps/modernjs/src/components/react-component.prefetch.ts
@@ -0,0 +1,19 @@
+import { defer } from '@modern-js/runtime/router';
+import React from 'react';
+
+console.log(React);
+const defaultVal = {
+  data: {
+    id: 1,
+    title: 'A Prefetch Title',
+  },
+};
+
+export default (params = defaultVal) =>
+  defer({
+    userInfo: new Promise(resolve => {
+      setTimeout(() => {
+        resolve(params);
+      }, 2000);
+    }),
+  });