Merge branch 'main' into chore/use-real-dir

module-federation · Oct 8, 2024 · f5634c3 · f5634c3
2 parents 1980dfa + 8a77291
commit f5634c3
Show file tree

Hide file tree

Showing 308 changed files with 27,915 additions and 37,725 deletions.
diff --git a/.changeset/ai-brave-tiger.md b/.changeset/ai-brave-tiger.md
diff --git a/.changeset/ai-brave-wolf.md b/.changeset/ai-brave-wolf.md
diff --git a/.changeset/ai-calm-bear.md b/.changeset/ai-calm-bear.md
@@ -0,0 +1,7 @@
+---
+"@module-federation/enhanced": patch
+---
+
+Added a check to skip processing when virtualRuntimeEntry is present.
+
+- Added an early return in `FederationRuntimePlugin` to skip processing if `options.virtualRuntimeEntry` is defined.
diff --git a/.changeset/ai-hungry-wolf.md b/.changeset/ai-hungry-wolf.md
diff --git a/.changeset/ai-lazy-cat.md b/.changeset/ai-lazy-cat.md
diff --git a/.changeset/ai-quick-lion.md b/.changeset/ai-quick-lion.md
diff --git a/.changeset/ai-sleepy-lion.md b/.changeset/ai-sleepy-lion.md
diff --git a/.changeset/chilly-rocks-deliver.md b/.changeset/chilly-rocks-deliver.md
diff --git a/.changeset/cuddly-pumpkins-switch.md b/.changeset/cuddly-pumpkins-switch.md
@@ -0,0 +1,5 @@
+---
+'@module-federation/bridge-react': patch
+---
+
+fix(bridge-react): add default basename for WraperRouterProvider
diff --git a/.changeset/eight-comics-reflect.md b/.changeset/eight-comics-reflect.md
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -27,14 +27,18 @@
       "rules": {
         "@typescript-eslint/ban-ts-comment": "off",
         "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/no-unused-vars": "off"
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
       }
     },
     {
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
       "rules": {
-        "@typescript-eslint/no-useless-constructor": "off"
+        "@typescript-eslint/no-useless-constructor": "off",
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
       }
     },
     {

diff --git a/.github/workflows/devtools.yml b/.github/workflows/devtools.yml
@@ -62,9 +62,8 @@ jobs:
             npx kill-port 3009 3010 3011 3012 3013 4001 &&
             npx kill-port 3009 3010 3011 3012 3013 4001 &&
             pnpm run app:manifest:prod & echo "done" && \
-            npx kill-port 4001
             npx wait-on tcp:3009 tcp:3010 tcp:3011 tcp:3012 tcp:3013 && \
-            sleep 10 &&
+            sleep 30 &&
             npx nx e2e:devtools chrome-devtools
 
       - name: kill port

diff --git a/.github/workflows/e2e-modern.yml b/.github/workflows/e2e-modern.yml
@@ -44,3 +44,6 @@ jobs:
       - name: E2E Test for ModernJS
         if: steps.check-ci.outcome == 'success'
         run: npx kill-port --port 4001 && npx nx run-many --target=test:e2e --projects=modernjs --parallel=1 && npx kill-port --port 4001
+
+      - name: Kill ports
+        run: npx kill-port --port 4001
diff --git a/.github/workflows/e2e-next-dev.yml b/.github/workflows/e2e-next-dev.yml
@@ -49,4 +49,4 @@ jobs:
           npx wait-on tcp:3002 &&
           npx wait-on tcp:3000 &&
           npx nx run-many --target=test:e2e --projects=3000-home,3001-shop,3002-checkout --parallel=1 &&
-          lsof -ti tcp:3000,3001,3002 | xargs kill
+          npx kill-port 3000,3001,3002
diff --git a/.github/workflows/e2e-next-prod.yml b/.github/workflows/e2e-next-prod.yml
@@ -50,4 +50,4 @@ jobs:
           npx wait-on tcp:3002 &&
           npx wait-on tcp:3000 &&
           npx nx run-many --target=test:e2e --projects=3000-home,3001-shop,3002-checkout --parallel=1 &&
-          lsof -ti tcp:3000,3001,3002 | xargs kill
+          npx kill-port 3000,3001,3002
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Install deps
         run: pnpm install
 
-      - name: Build and test Packages
+      - name: Build Packages
         run: pnpm run build:pkg
 
       - name: Release

diff --git a/.prettierignore b/.prettierignore
@@ -8,3 +8,6 @@
 pnpm-lock.yaml
 **/dist/**
 apps/website-new/docs
+
+/.nx/workspace-data
+/.nx/cache
diff --git a/ai-lint-fix.js b/ai-lint-fix.js
@@ -38,15 +38,16 @@ async function lintFileContent(fileContent) {
 RULES:
 -Should preserve uses of normalizeWebpackPath
 -Should preserve uses of ts-ignore
--Removed commented out code
+-Should improve the source code while ensuing its logic is preserved and functionality is not altered
+-Update existing comments for accuracy
 -Return only the updated file content with no other response text:
 
 ${fileContent}`;
 
   const response = await openai.chat.completions.create({
     model: 'gpt-4o',
     messages: [{ role: 'user', content: prompt }],
-    max_tokens: 4096,
+    max_completion_tokens: 4096,
   });
 
   let res = response.choices[0].message.content.trim().split('\n');

diff --git a/apps/3000-home/components/SharedNav.tsx b/apps/3000-home/components/SharedNav.tsx
@@ -24,7 +24,6 @@ const SharedNav = () => {
         </>
       ),
       key: '/',
-      onMouseEnter: () => {},
     },
     {
       className: 'shop-menu-link',

diff --git a/apps/3000-home/package.json b/apps/3000-home/package.json
@@ -5,22 +5,9 @@
   "dependencies": {
     "antd": "5.19.1",
     "@ant-design/cssinjs": "^1.21.0",
-    "buffer": "5.7.1",
-    "encoding": "0.1.13",
-    "eslint-scope": "7.2.2",
-    "events": "3.3.0",
-    "js-cookie": "3.0.5",
     "lodash": "4.17.21",
-    "next": "14.1.2",
-    "node-fetch": "2.7.0",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "schema-utils": "3.3.0",
-    "terser-webpack-plugin": "5.3.10",
-    "typescript": "5.3.3",
-    "upath": "2.0.1",
-    "url": "0.11.3",
-    "util": "0.12.5"
+    "next": "14.2.14",
+    "react": "18.3.1"
   },
   "devDependencies": {
     "@module-federation/nextjs-mf": "workspace:*",

diff --git a/apps/3000-home/project.json b/apps/3000-home/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/3000-home",
   "projectType": "application",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/next:build",
@@ -93,6 +94,5 @@
         ]
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/apps/3001-shop/package.json b/apps/3001-shop/package.json
@@ -3,31 +3,11 @@
   "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "acorn": "8.12.1",
     "antd": "5.19.1",
     "@ant-design/cssinjs": "^1.21.0",
-    "buffer": "5.7.1",
-    "chrome-trace-event": "1.0.4",
-    "encoding": "0.1.13",
-    "enhanced-resolve": "5.15.0",
-    "eslint-scope": "7.2.2",
-    "eventemitter3": "5.0.1",
-    "events": "3.3.0",
-    "fast-glob": "3.3.2",
     "lodash": "4.17.21",
-    "next": "14.1.2",
-    "node-fetch": "2.7.0",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "schema-utils": "3.3.0",
-    "semver": "6.3.1",
-    "tapable": "2.2.1",
-    "terser-webpack-plugin": "5.3.10",
-    "typescript": "5.3.3",
-    "upath": "2.0.1",
-    "url": "0.11.3",
-    "util": "0.12.5",
-    "webpack-sources": "3.2.3"
+    "next": "14.2.14",
+    "react": "18.3.1"
   },
   "devDependencies": {
     "@module-federation/nextjs-mf": "workspace:*",

diff --git a/apps/3001-shop/project.json b/apps/3001-shop/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/3001-shop",
   "projectType": "application",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/next:build",
@@ -92,6 +93,5 @@
         }
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/apps/3002-checkout/package.json b/apps/3002-checkout/package.json
@@ -3,31 +3,11 @@
   "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "acorn": "8.12.1",
     "antd": "5.19.1",
     "@ant-design/cssinjs": "^1.21.0",
-    "buffer": "5.7.1",
-    "chrome-trace-event": "1.0.4",
-    "encoding": "0.1.13",
-    "enhanced-resolve": "5.15.0",
-    "eslint-scope": "7.2.2",
-    "eventemitter3": "5.0.1",
-    "events": "3.3.0",
-    "fast-glob": "3.3.2",
     "lodash": "4.17.21",
-    "next": "14.1.2",
-    "node-fetch": "2.7.0",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "schema-utils": "3.3.0",
-    "semver": "6.3.1",
-    "tapable": "2.2.1",
-    "terser-webpack-plugin": "5.3.10",
-    "typescript": "5.3.3",
-    "upath": "2.0.1",
-    "url": "0.11.3",
-    "util": "0.12.5",
-    "webpack-sources": "3.2.3"
+    "next": "14.2.14",
+    "react": "18.3.1"
   },
   "devDependencies": {
     "@module-federation/nextjs-mf": "workspace:*",

diff --git a/apps/3002-checkout/project.json b/apps/3002-checkout/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/3002-checkout",
   "projectType": "application",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/next:build",
@@ -92,6 +93,5 @@
         }
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/apps/docs/project.json b/apps/docs/project.json
@@ -3,8 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "apps/docs/src",
-  "implicitDependencies": ["docs-ui"],
   "tags": [],
+  "implicitDependencies": ["docs-ui"],
   "targets": {
     "serve": {
       "executor": "@nx/web:file-server",

diff --git a/apps/docs/src/en/modules/ROOT/pages/angular-way/mf-ssr-angular.adoc b/apps/docs/src/en/modules/ROOT/pages/angular-way/mf-ssr-angular.adoc
@@ -56,7 +56,7 @@ cd myorganization
 +
 [source, bash]
 ----
-npm install @nrwl/angular
+npm install @nx/angular
 ----
 
 === Generating the Applications
@@ -105,4 +105,4 @@ If you are actively working on the 'login' application and need to see the resul
 npx nx serve-ssr dashboard --devRemotes=login
 ----
 
-Using this command, the server will rebuild the 'login' application whenever you make changes, allowing for an iterative and efficient development process.
+Using this command, the server will rebuild the 'login' application whenever you make changes, allowing for an iterative and efficient development process.