Skip to content

Commit c271f38

Browse files
chore: merge main branch and resolve conflicts for share-filter PR
- Keep Next 15 and React 19 versions from share-filter branch - Add utilities dependency from main to Next.js apps - Keep newer Modern.js versions (2.68.2) from main - Keep enhanced dependency tracking from share-filter branch - Keep better error handling from main in EmbedFederationRuntimeModule and StartupHelpers - Keep specific typing for addRemoteDependency from share-filter branch - Update imports to use ModuleFederation instead of FederationHost - Regenerate pnpm-lock.yaml
2 parents f8b554c + cce6a94 commit c271f38

File tree

283 files changed

+9878
-6326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

283 files changed

+9878
-6326
lines changed

.changeset/hook-renaming-cleanup.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
"@module-federation/enhanced": patch
3+
"@module-federation/nextjs-mf": patch
4+
---
5+
6+
refactor: rename container hooks for clarity and consistency
7+
8+
- Renamed `addContainerEntryModule` to `addContainerEntryDependency`
9+
- Renamed `addFederationRuntimeModule` to `addFederationRuntimeDependency`
10+
- Added new `addRemoteDependency` hook for remote module tracking
11+
- Updated all hook usages across the codebase to use new names
12+
- This is an internal refactoring with no breaking changes to external APIs

.changeset/runtime-safety-checks.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@module-federation/enhanced": patch
3+
---
4+
5+
fix(enhanced): add runtime safety checks to prevent errors
6+
7+
- Add typeof check for prevStartup function in EmbedFederationRuntimeModule to prevent calling undefined function
8+
- Add typeof check for __webpack_require__.x in StartupHelpers to prevent calling undefined function
9+
- Add warning logs when these functions are missing to help developers debug issues

.changeset/tidy-foxes-fix.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

.github/workflows/build-and-test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ jobs:
5555
- name: Print Number of CPU Cores
5656
run: nproc
5757

58+
- name: Warm Nx Cache
59+
run: npx nx run-many --targets=build --projects=tag:type:pkg --parallel=4 --skip-nx-cache
60+
5861
- name: Run Build for All
5962
uses: nick-fields/retry@v3
6063
with:

INCREMENTAL_PR_PLAN_REVISED.md

Lines changed: 0 additions & 303 deletions
This file was deleted.

apps/3000-home/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"devDependencies": {
1414
"@module-federation/nextjs-mf": "workspace:*",
1515
"@module-federation/runtime": "workspace:*",
16-
"webpack": "^5.98.0"
16+
"@module-federation/utilities": "workspace:*",
17+
"webpack": "5.98.0"
1718
},
1819
"scripts": {
1920
"start": "next start",

apps/3001-shop/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"@module-federation/nextjs-mf": "workspace:*",
1515
"@module-federation/runtime": "workspace:*",
1616
"@module-federation/sdk": "workspace:*",
17-
"webpack": "^5.98.0"
17+
"@module-federation/utilities": "workspace:*",
18+
"webpack": "5.98.0"
1819
},
1920
"scripts": {
2021
"start": "next start",

apps/3002-checkout/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"@module-federation/nextjs-mf": "workspace:*",
1515
"@module-federation/runtime": "workspace:*",
1616
"@module-federation/sdk": "workspace:*",
17-
"webpack": "^5.98.0"
17+
"@module-federation/utilities": "workspace:*",
18+
"webpack": "5.98.0"
1819
},
1920
"scripts": {
2021
"start": "next start",

apps/manifest-demo/webpack-host/runtimePlugin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { FederationRuntimePlugin } from '@module-federation/runtime/types';
1+
import { ModuleFederationRuntimePlugin } from '@module-federation/runtime/types';
22

3-
export default function (): FederationRuntimePlugin {
3+
export default function (): ModuleFederationRuntimePlugin {
44
return {
55
name: 'custom-plugin-build',
66
beforeInit(args) {

apps/manifest-demo/webpack-host/src/runtimePlugin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { FederationRuntimePlugin } from '@module-federation/runtime/types';
2-
export default function (): FederationRuntimePlugin {
1+
import { ModuleFederationRuntimePlugin } from '@module-federation/runtime/types';
2+
export default function (): ModuleFederationRuntimePlugin {
33
return {
44
name: 'custom-plugin',
55
beforeInit(args) {

0 commit comments

Comments
 (0)