Skip to content

Commit 2885681

Browse files
fix: resolve merge conflicts with pr7-enhanced-filtering
Resolve merge conflicts between pr8-unified-api and pr7-enhanced-filtering branches: ## Resolved conflicts: - .github/workflows/build-and-test.yml: Preserved SDK build step with skip cache - .github/workflows/devtools.yml: Maintained skip-nx-cache flag for build consistency - packages/rsbuild-plugin/rollup.config.js: Kept external dependency handling comments - packages/rsbuild-plugin/tsconfig.json: Combined include/exclude configurations - pnpm-lock.yaml: Automatically resolved through pnpm install ## Functionality preserved: - Enhanced filtering features from pr7-enhanced-filtering - Unified API improvements from pr8-unified-api - SDK build optimizations and workspace dependency handling - All filtering tests and new test cases 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
2 parents 8795f8b + 415b727 commit 2885681

File tree

259 files changed

+7332
-408332
lines changed

Some content is hidden

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

259 files changed

+7332
-408332
lines changed

.changeset/README.md

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

.changeset/chatty-avocados-vanish.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@module-federation/runtime': patch
3+
---
4+
5+
fix(runtime): support TypeScript moduleResolution NodeNext
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
"@module-federation/enhanced": patch
3+
---
4+
5+
test: add comprehensive test coverage for request pattern filtering
6+
7+
- Add integration tests for request pattern filtering in provide-filters test case
8+
- Add test cases verifying modules match/don't match request include filters
9+
- Add unit tests for `extractPathAfterNodeModules` utility function
10+
- Add unit tests for `createLookupKeyForSharing` utility function
11+
- Add test files for request filtering scenarios (components/Button.js, utils/helper.js, etc.)
12+
13+
This enhances test coverage to ensure request pattern filtering functionality works correctly and prevents regressions.

.changeset/enhanced-hoist-container-refs.md

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

.changeset/feat-share-filtering.md

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"@module-federation/dts-plugin": patch
3+
---
4+
5+
fix(dts-plugin): update koa to 2.16.2 to fix CVE-2025-8129
6+
7+
Security fix for open redirect vulnerability (GHSA-jgmv-j7ww-jx2x) in koa dependency.
8+
Updates koa from 2.16.1 to 2.16.2 to prevent attackers from manipulating the Referrer
9+
header in koa's back redirect functionality. Version 2.16.2 restricts redirects to
10+
same-origin only, preventing malicious external redirects.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"@module-federation/node": patch
3+
"@module-federation/sdk": patch
4+
---
5+
6+
fix(node): prevent infinite recursion in module imports
7+
8+
- Add import cache to prevent infinite recursion when modules have circular dependencies
9+
- Cache import promises to ensure each module is only imported once
10+
- Clear cache on import errors to allow retry attempts
11+
- Add comprehensive test coverage for recursion scenarios
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"@module-federation/rsbuild-plugin": patch
3+
---
4+
5+
fix(rsbuild-plugin): add build dependencies configuration to project.json
6+
7+
- Add dependsOn configuration to ensure dependencies are built before the plugin
8+
- Improves build reliability and fixes potential issues when dependencies haven't been built
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"@module-federation/enhanced": minor
3+
---
4+
5+
feat(enhanced): add include/exclude filtering for shared modules
6+
7+
- Add include/exclude filtering for both ConsumeSharedPlugin and ProvideSharedPlugin
8+
- Support version-based filtering using semantic version ranges (e.g., `include: { version: '^18.0.0' }`)
9+
- Support request pattern filtering with string and RegExp (e.g., `include: { request: /^Button/ }`)
10+
- Add singleton warnings when filters are used to prevent multiple shared instances
11+
- Enhanced type definitions and JSON schema validation for filtering options

.changeset/hook-renaming-cleanup.md

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

0 commit comments

Comments
 (0)