Skip to content

Commit c8a5544

Browse files
9aoy9aoy
committed
fix: merge conflict
2 parents f2180af + 9dd1c7e commit c8a5544

78 files changed

Lines changed: 978 additions & 1265 deletions

File tree

Some content is hidden

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
"lint-staged": "16.2.7",
2929
"taze": "^19.9.2"
3030
},
31-
"packageManager": "pnpm@10.28.2"
31+
"packageManager": "pnpm@10.33.0"
3232
}

‎pnpm-lock.yaml‎

Lines changed: 843 additions & 1015 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pnpm-workspace.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ packages:
66
- "rsdoctor/**"
77
- "rstest/**"
88
- "!**/dist"
9+
10+
dedupePeers: true

‎rsbuild/emotion/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"devDependencies": {
1717
"@rsbuild/core": "2.0.0-rc.1",
18-
"@rsbuild/plugin-react": "^1.4.6",
18+
"@rsbuild/plugin-react": "^2.0.0-rc.2",
1919
"@swc/plugin-emotion": "^14.8.0",
2020
"@types/react": "^19.2.10",
2121
"@types/react-dom": "^19.2.3",

‎rsbuild/module-federation-enhanced/consumer/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@module-federation/enhanced": "^0.23.0",
1616
"@module-federation/rsbuild-plugin": "^2.3.1",
1717
"@rsbuild/core": "2.0.0-rc.1",
18-
"@rsbuild/plugin-react": "^1.4.6",
18+
"@rsbuild/plugin-react": "^2.0.0-rc.2",
1919
"@types/react": "^19.2.10",
2020
"@types/react-dom": "^19.2.3",
2121
"typescript": "^5.9.3"

‎rsbuild/module-federation-enhanced/provider/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@module-federation/enhanced": "^0.23.0",
1616
"@module-federation/rsbuild-plugin": "^2.3.1",
1717
"@rsbuild/core": "2.0.0-rc.1",
18-
"@rsbuild/plugin-react": "^1.4.6",
18+
"@rsbuild/plugin-react": "^2.0.0-rc.2",
1919
"@types/react": "^19.2.10",
2020
"@types/react-dom": "^19.2.3",
2121
"typescript": "^5.9.3"

‎rsbuild/module-federation/host/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@rsbuild/core": "2.0.0-rc.1",
16-
"@rsbuild/plugin-react": "^1.4.6",
16+
"@rsbuild/plugin-react": "^2.0.0-rc.2",
1717
"typescript": "^5.9.3"
1818
}
1919
}

‎rsbuild/module-federation/remote/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@rsbuild/core": "2.0.0-rc.1",
16-
"@rsbuild/plugin-react": "^1.4.6",
16+
"@rsbuild/plugin-react": "^2.0.0-rc.2",
1717
"typescript": "^5.9.3"
1818
}
1919
}

‎rsbuild/query-raw/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"devDependencies": {
1616
"@rsbuild/core": "2.0.0-rc.1",
17-
"@rsbuild/plugin-react": "^1.4.6",
17+
"@rsbuild/plugin-react": "^2.0.0-rc.2",
1818
"@types/react": "^19.2.10",
1919
"@types/react-dom": "^19.2.3",
2020
"typescript": "^5.9.3"

‎rsbuild/react-compiler-babel/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"devDependencies": {
1616
"@rsbuild/core": "2.0.0-rc.1",
1717
"@rsbuild/plugin-babel": "^1.1.2",
18-
"@rsbuild/plugin-react": "^1.4.6",
18+
"@rsbuild/plugin-react": "^2.0.0-rc.2",
1919
"@types/react": "^19.2.10",
2020
"@types/react-dom": "^19.2.3",
2121
"babel-plugin-react-compiler": "^1.0.0",

0 commit comments

Comments
 (0)