Skip to content

Commit f9bcfac

Browse files
Merge branch 'main' into feat/enhanced-hoist-container-refs
2 parents abaf4f5 + cce6a94 commit f9bcfac

File tree

279 files changed

+9584
-5913
lines changed

Some content is hidden

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

279 files changed

+9584
-5913
lines changed

.changeset/runtime-safety-checks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
fix(enhanced): add runtime safety checks to prevent errors
66

7-
- Add typeof check for oldStartup function in EmbedFederationRuntimeModule to prevent calling undefined function
7+
- Add typeof check for prevStartup function in EmbedFederationRuntimeModule to prevent calling undefined function
88
- Add typeof check for __webpack_require__.x in StartupHelpers to prevent calling undefined function
99
- 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
run: nproc
5757

5858
- name: Warm Nx Cache
59-
run: npx nx run-many --targets=build --projects=tag:type:pkg --parallel=4
59+
run: npx nx run-many --targets=build --projects=tag:type:pkg --parallel=4 --skip-nx-cache
6060

6161
- name: Run Build for All
6262
run: npx nx run-many --targets=build --projects=tag:type:pkg --parallel=4 --skip-nx-cache

.github/workflows/devtools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: pnpm install
3939

4040
- name: Run Affected Build
41-
run: npx nx run-many --targets=build --projects=tag:type:pkg
41+
run: npx nx run-many --targets=build --projects=tag:type:pkg --skip-nx-cache
4242

4343
- name: Configuration xvfb
4444
shell: bash

INCREMENTAL_PR_PLAN_REVISED.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
f# Revised Incremental PR Plan for packages/enhanced Changes
1+
# Revised Incremental PR Plan for packages/enhanced Changes
22

33
## Overview
44
Based on a detailed diff analysis, this document provides a more accurate breakdown of changes into focused, incremental PRs. Each PR represents a distinct feature, fix, or refactor that can be merged independently.
@@ -12,7 +12,7 @@ Based on a detailed diff analysis, this document provides a more accurate breakd
1212
**Feature**: Add defensive checks to prevent runtime errors
1313

1414
**Files to include**:
15-
- `src/lib/container/runtime/EmbedFederationRuntimeModule.ts` (add `typeof oldStartup === 'function'` check)
15+
- `src/lib/container/runtime/EmbedFederationRuntimeModule.ts` (add `typeof prevStartup === 'function'` check)
1616
- `src/lib/startup/StartupHelpers.ts` (add `typeof __webpack_require__.x === "function"` check)
1717

1818
**Why first**: These are independent safety fixes that improve stability without any dependencies.
@@ -47,7 +47,6 @@ compiler.hooks.addRemoteDependency = new SyncHook([...]);
4747
```
4848

4949
**Note**: This is NOT a breaking change because all hook usages within the codebase are updated in the same PR.
50-
5150
---
5251

5352
### PR 3: Enhanced HoistContainerReferencesPlugin
@@ -287,4 +286,8 @@ All Feature PRs ─────────────────────
287286
2. **Reduced Risk**: Smaller, focused changes are easier to review and test
288287
3. **Flexibility**: Some PRs can be developed in parallel
289288
4. **Progressive Enhancement**: Each filtering feature builds on the previous
289+
<<<<<<< HEAD
290+
5. **Early Wins**: Runtime fixes and hook renaming can be merged quickly
291+
=======
290292
5. **Early Wins**: Runtime fixes and hook renaming can be merged quickly
293+
>>>>>>> origin/refactor/hook-renaming-cleanup-v2

apps/3000-home/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
"antd": "5.19.1",
88
"lodash": "4.17.21",
99
"next": "14.2.16",
10-
"react": "18.3.1"
10+
"react": "18.3.1",
11+
"react-dom": "18.3.1"
1112
},
1213
"devDependencies": {
1314
"@module-federation/nextjs-mf": "workspace:*",
1415
"@module-federation/runtime": "workspace:*",
15-
"@module-federation/utilities": "workspace:*"
16+
"@module-federation/utilities": "workspace:*",
17+
"webpack": "5.98.0"
1618
},
1719
"scripts": {
1820
"start": "next start",

apps/3001-shop/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
"antd": "5.19.1",
88
"lodash": "4.17.21",
99
"next": "14.2.16",
10-
"react": "18.3.1"
10+
"react": "18.3.1",
11+
"react-dom": "18.3.1"
1112
},
1213
"devDependencies": {
1314
"@module-federation/nextjs-mf": "workspace:*",
1415
"@module-federation/runtime": "workspace:*",
1516
"@module-federation/sdk": "workspace:*",
16-
"@module-federation/utilities": "workspace:*"
17+
"@module-federation/utilities": "workspace:*",
18+
"webpack": "5.98.0"
1719
},
1820
"scripts": {
1921
"start": "next start",

apps/3002-checkout/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
"antd": "5.19.1",
88
"lodash": "4.17.21",
99
"next": "14.2.16",
10-
"react": "18.3.1"
10+
"react": "18.3.1",
11+
"react-dom": "18.3.1"
1112
},
1213
"devDependencies": {
1314
"@module-federation/nextjs-mf": "workspace:*",
1415
"@module-federation/runtime": "workspace:*",
1516
"@module-federation/sdk": "workspace:*",
16-
"@module-federation/utilities": "workspace:*"
17+
"@module-federation/utilities": "workspace:*",
18+
"webpack": "5.98.0"
1719
},
1820
"scripts": {
1921
"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)