Skip to content

Commit 8a072b6

Browse files
2heal12heal1
committed
chore: merge main
2 parents d3f4639 + f4f843d commit 8a072b6

File tree

653 files changed

+33155
-5200
lines changed

Some content is hidden

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

653 files changed

+33155
-5200
lines changed

‎.changeset/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"@module-federation/rsbuild-plugin",
2626
"@module-federation/error-codes",
2727
"@module-federation/inject-external-runtime-core-plugin",
28-
"@module-federation/runtime-core"
28+
"@module-federation/runtime-core",
29+
"create-module-federation"
2930
]
3031
],
3132
"ignorePatterns": ["^alpha|^beta"],

‎.changeset/nice-rice-count.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@module-federation/bridge-react': patch
3+
---
4+
5+
remove @loadable/component from package.json

‎.cursorignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ tools/
5252
.vscode/
5353
.verdaccio/
5454

55+
!apps/manifest-demo/*.ts
56+
5557
# Ignore specific files
5658
.cursorignore
5759
jest.preset.js

‎.cursorrules

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
an assistant that engages in extremely thorough, self-questioning reasoning. Your approach mirrors human stream-of-
2+
consciousness thinking, characterized by continuous exploration, self-doubt, and iterative analysis.
3+
## Core Principles
4+
1. EXPLORATION OVER CONCLUSION
5+
- Never rush to conclusions
6+
- Keep exploring until a solution emerges naturally from the evidence
7+
- If uncertain, continue reasoning indefinitely
8+
- Question every assumption and inference
9+
2. DEPTH OF REASONING
10+
- Engage in extensive contemplation (minimum 10,000 characters)
11+
- Express thoughts in natural, conversational internal monologue
12+
- Break down complex thoughts into simple, atomic steps
13+
- Embrace uncertainty and revision of previous thoughts
14+
3. THINKING PROCESS
15+
- Use short, simple sentences that mirror natural thought patterns
16+
- Express uncertainty and internal debate freely
17+
- Show work-in-progress thinking
18+
- Acknowledge and explore dead ends
19+
- Frequently backtrack and revise
20+
- Contemplate before each new action
21+
- Contemplate after each and every step
22+
4. PERSISTENCE
23+
- Value thorough exploration over quick resolution
24+
## Output Format
25+
Your responses
26+
must follow this exact structure given below.
27+
Make sure
28+
to
29+
always include the final answer.
30+
...
31+
<contemplator>
32+
Your extensive internal monologue goes here
33+
- Begin with small, foundational observations
34+
- read each file related to the subject in full, make functional observations
35+
- Question each step thoroughly
36+
- Show natural thought progression
37+
- Express doubts and uncertainties
38+
- Revise and backtrack if you need to
39+
- Continue until natural resolution </contemplator>
40+

‎.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
node_modules/
22
vite.config.ts
3-
**/dist/**
3+
**/dist/**

‎.github/workflows/e2e-modern-ssr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ jobs:
4848
lsof -ti tcp:3050,3051,3052,3053,3054,3055,3056 | xargs -r kill &&
4949
pnpm run app:modern:dev &
5050
sleep 30 &&
51-
npx wait-on http://127.0.0.1:3050/mf-manifest.json &&
5251
npx wait-on http://127.0.0.1:3051/mf-manifest.json &&
53-
npx wait-on http://127.0.0.1:3052/mf-manifest.json &&
5452
npx wait-on http://127.0.0.1:3053/mf-manifest.json &&
55-
npx wait-on http://127.0.0.1:3054/mf-manifest.json &&
5653
npx wait-on http://127.0.0.1:3055/mf-manifest.json &&
5754
npx wait-on http://127.0.0.1:3056/mf-manifest.json &&
55+
npx wait-on http://127.0.0.1:3054/mf-manifest.json &&
56+
npx wait-on http://127.0.0.1:3052/mf-manifest.json &&
57+
npx wait-on http://127.0.0.1:3050/mf-manifest.json &&
5858
npx nx run modernjs-ssr-host:e2e &&
5959
lsof -ti tcp:3050,3051,3052,3053,3054,3055,3056 | xargs kill

‎.github/workflows/e2e-next-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
- name: E2E Test for Next.js Dev
4949
if: steps.check-ci.outcome == 'success'
5050
run: |
51+
npx kill-port 3000,3001,3002 &&
5152
pnpm run app:next:dev &
5253
sleep 1 &&
5354
npx wait-on tcp:3001 &&

‎.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/.nx
1010
# dependencies
1111
node_modules
12-
12+
./webpack-lib
1313
# IDEs and editors
1414
/.idea
1515
.project
@@ -70,4 +70,5 @@ packages/enhanced/test/js
7070
# storybook cases
7171
!apps/rslib-module/@mf-types/**
7272

73-
**/vite.config.{js,ts,mjs,mts,cjs,cts}.timestamp*
73+
**/vite.config.{js,ts,mjs,mts,cjs,cts}.timestamp*
74+
/webpack-lib/

‎.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ apps/website-new/docs
1111

1212
/.nx/workspace-data
1313
/.nx/cache
14+
15+
**/*.handlebars

‎apps/esbuild/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@module-federation/webpack-bundler-runtime": "workspace:*",
2323
"@types/node": "^18.7.13",
2424
"concurrently": "^8.2.2",
25-
"esbuild": "^0.15.5",
25+
"esbuild": "^0.25.0",
2626
"json5": "^2.2.1",
2727
"live-server": "^1.1.0",
2828
"typescript": "^4.8.2"

0 commit comments

Comments
 (0)