Merge branch 'main' into feat/search_package_json_for_dual_mode

module-federation · Oct 21, 2024 · 4db7c35 · 4db7c35
2 parents 9ca1e7c + b29c403
commit 4db7c35
Show file tree

Hide file tree

Showing 104 changed files with 3,293 additions and 957 deletions.
diff --git a/.changeset/ai-quick-eagle.md b/.changeset/ai-quick-eagle.md
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -21,7 +21,8 @@
       "@module-federation/bridge-react-webpack-plugin",
       "@module-federation/modern-js",
       "@module-federation/retry-plugin",
-      "@module-federation/data-prefetch"
+      "@module-federation/data-prefetch",
+      "@module-federation/rsbuild-plugin"
     ]
   ],
   "ignorePatterns": ["^alpha|^beta"],

diff --git a/.changeset/fuzzy-brooms-dance.md b/.changeset/fuzzy-brooms-dance.md
diff --git a/.changeset/happy-chefs-pay.md b/.changeset/happy-chefs-pay.md
@@ -0,0 +1,5 @@
+---
+'@module-federation/rsbuild-plugin': patch
+---
+
+fix: configure the default assetPrefix for MF apps correctly
diff --git a/.changeset/hip-pandas-care.md b/.changeset/hip-pandas-care.md
diff --git a/.changeset/mean-geckos-help.md b/.changeset/mean-geckos-help.md
diff --git a/ai-lint-fix.js b/ai-lint-fix.js
@@ -7,6 +7,7 @@ const { OpenAI } = require('openai');
 const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
 const glob = require('glob');
+
 // Initialize OpenAI client
 const openai = new OpenAI({
   apiKey: process.env.OPENAI_API_KEY,
@@ -68,21 +69,6 @@ async function processFile(filePath) {
     const lintedContent = await lintFileContent(fileContent);
     fs.writeFileSync(filePath, lintedContent, 'utf8');
     console.log(`File has been linted and updated successfully: ${filePath}`);
-    const tsConfigPath = findTsConfig(filePath);
-    try {
-      const tscOutput = execFileSync(
-        'tsc',
-        ['--noEmit', '--project', tsConfigPath],
-        {
-          stdio: 'pipe',
-        },
-      ).toString();
-      console.log(`TypeScript check passed for ${filePath}:\n${tscOutput}`);
-    } catch (error) {
-      console.error(
-        `TypeScript check failed for ${filePath}:\n${error.stdout.toString()}`,
-      );
-    }
   } catch (error) {
     console.error(`Error performing linting on ${filePath}:`, error.message);
     process.exit(1);
@@ -101,17 +87,32 @@ function findTsConfig(filePath) {
   throw new Error('tsconfig.json not found');
 }
 
+async function processFilesWithConcurrencyLimit(files, limit) {
+  const results = [];
+  const executing = [];
+
+  for (const file of files) {
+    const p = processFile(file).then(() => {
+      executing.splice(executing.indexOf(p), 1);
+    });
+    results.push(p);
+    executing.push(p);
+    if (executing.length >= limit) {
+      await Promise.race(executing);
+    }
+  }
+
+  return Promise.all(results);
+}
+
 async function main() {
   if (argv.path) {
     await processFile(argv.path);
   } else if (argv.pattern) {
     console.log('pattern', argv.pattern);
     try {
       const files = await glob.glob(argv.pattern);
-
-      for (const filePath of files) {
-        await processFile(filePath);
-      }
+      await processFilesWithConcurrencyLimit(files, 3); // Process files with concurrency limit of 3
     } catch (err) {
       console.error('Error finding files:', err.message);
       process.exit(1);

diff --git a/apps/3000-home/package.json b/apps/3000-home/package.json
@@ -6,7 +6,7 @@
     "antd": "5.19.1",
     "@ant-design/cssinjs": "^1.21.0",
     "lodash": "4.17.21",
-    "next": "14.2.14",
+    "next": "14.2.15",
     "react": "18.3.1"
   },
   "devDependencies": {

diff --git a/apps/3001-shop/package.json b/apps/3001-shop/package.json
@@ -6,7 +6,7 @@
     "antd": "5.19.1",
     "@ant-design/cssinjs": "^1.21.0",
     "lodash": "4.17.21",
-    "next": "14.2.14",
+    "next": "14.2.15",
     "react": "18.3.1"
   },
   "devDependencies": {

diff --git a/apps/3002-checkout/package.json b/apps/3002-checkout/package.json
@@ -6,7 +6,7 @@
     "antd": "5.19.1",
     "@ant-design/cssinjs": "^1.21.0",
     "lodash": "4.17.21",
-    "next": "14.2.14",
+    "next": "14.2.15",
     "react": "18.3.1"
   },
   "devDependencies": {

diff --git a/apps/modernjs-ssr/dynamic-nested-remote/CHANGELOG.md b/apps/modernjs-ssr/dynamic-nested-remote/CHANGELOG.md
@@ -1,5 +1,11 @@
 # modernjs-ssr-dynamic-nested-remote
 
+## 0.1.31
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.11
+
 ## 0.1.30
 
 ### 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.30",
+  "version": "0.1.31",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.25.7",
-    "@modern-js/runtime": "2.60.2",
+    "@modern-js/runtime": "2.60.3",
     "@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.2",
+    "@modern-js/app-tools": "2.60.3",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.2",
+    "@modern-js/tsconfig": "2.60.3",
     "@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/CHANGELOG.md b/apps/modernjs-ssr/dynamic-remote-new-version/CHANGELOG.md
@@ -1,5 +1,11 @@
 # modernjs-ssr-dynamic-remote-new-version
 
+## 0.1.31
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.11
+
 ## 0.1.30
 
 ### 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.30",
+  "version": "0.1.31",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.4",
-    "@modern-js/runtime": "2.60.2",
+    "@modern-js/runtime": "2.60.3",
     "@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.2",
+    "@modern-js/app-tools": "2.60.3",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.2",
+    "@modern-js/tsconfig": "2.60.3",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/dynamic-remote/CHANGELOG.md b/apps/modernjs-ssr/dynamic-remote/CHANGELOG.md
@@ -1,5 +1,11 @@
 # modernjs-ssr-dynamic-remote
 
+## 0.1.31
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.11
+
 ## 0.1.30
 
 ### 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.30",
+  "version": "0.1.31",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.4",
-    "@modern-js/runtime": "2.60.2",
+    "@modern-js/runtime": "2.60.3",
     "@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.2",
+    "@modern-js/app-tools": "2.60.3",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.2",
+    "@modern-js/tsconfig": "2.60.3",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/host/CHANGELOG.md b/apps/modernjs-ssr/host/CHANGELOG.md
@@ -1,5 +1,11 @@
 # modernjs-ssr-host
 
+## 0.1.31
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.11
+
 ## 0.1.30
 
 ### 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.30",
+  "version": "0.1.31",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.4",
-    "@modern-js/runtime": "2.60.2",
+    "@modern-js/runtime": "2.60.3",
     "@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.2",
+    "@modern-js/app-tools": "2.60.3",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.2",
+    "@modern-js/tsconfig": "2.60.3",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/nested-remote/CHANGELOG.md b/apps/modernjs-ssr/nested-remote/CHANGELOG.md
@@ -1,5 +1,11 @@
 # modernjs-ssr-nested-remote
 
+## 0.1.31
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.11
+
 ## 0.1.30
 
 ### 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.30",
+  "version": "0.1.31",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.4",
-    "@modern-js/runtime": "2.60.2",
+    "@modern-js/runtime": "2.60.3",
     "@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.2",
+    "@modern-js/app-tools": "2.60.3",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.2",
+    "@modern-js/tsconfig": "2.60.3",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",

diff --git a/apps/modernjs-ssr/remote-new-version/CHANGELOG.md b/apps/modernjs-ssr/remote-new-version/CHANGELOG.md
@@ -1,5 +1,11 @@
 # modernjs-ssr-remote-new-version
 
+## 0.1.33
+
+### Patch Changes
+
+- @module-federation/modern-js@0.6.11
+
 ## 0.1.32
 
 ### 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.32",
+  "version": "0.1.33",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",
@@ -26,17 +26,17 @@
   ],
   "dependencies": {
     "@babel/runtime": "7.24.4",
-    "@modern-js/runtime": "2.60.2",
+    "@modern-js/runtime": "2.60.3",
     "@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.2",
+    "@modern-js/app-tools": "2.60.3",
     "@modern-js/eslint-config": "2.59.0",
-    "@modern-js/tsconfig": "2.60.2",
+    "@modern-js/tsconfig": "2.60.3",
     "@types/jest": "~29.5.0",
     "@types/node": "~16.11.7",
     "@types/react": "~18.2.0",