Skip to content

Commit 2395557

Browse files
gnoffgnoff
authored
Update React from 60a927d04 to 2bc7d336a (#61522)
Updates React from 60a927d04 to 2bc7d336a Also updates aliases for `react.shared-subset` to `react.react-server` ### React upstream changes - facebook/react#28250 - facebook/react#28225 - facebook/react#28123 - facebook/react#28240 - facebook/react#28239 - facebook/react#28245 - facebook/react#28244 - facebook/react#28238 - facebook/react#28235 - facebook/react#28221 - facebook/react#28215 - facebook/react#28214 - facebook/react#28213 - facebook/react#28212 - facebook/react#28211 - facebook/react#28247 - facebook/react#28210 - facebook/react#28186 - facebook/react#28232 - facebook/react#28169 - facebook/react#28177 - facebook/react#28170 - facebook/react#28168 - facebook/react#28122 - facebook/react#27982 - facebook/react#28217 - facebook/react#28223 - facebook/react#28208 - facebook/react#28209 - facebook/react#28200 - facebook/react#28199 - facebook/react#28198 - facebook/react#28197 - facebook/react#28196 - facebook/react#28194 - facebook/react#28192 - facebook/react#28191 - facebook/react#28182 - facebook/react#28181 - facebook/react#28180 - facebook/react#28178 - facebook/react#28201 - facebook/react#28176 - facebook/react#28162 - facebook/react#28131 - facebook/react#28190 - facebook/react#28172 - facebook/react#28171 - facebook/react#28173 - facebook/react#28174 - facebook/react#28175 - facebook/react#28136 - facebook/react#28135 - facebook/react#28134 - facebook/react#28133 - facebook/react#28132 - facebook/react#28130 - facebook/react#28202 - facebook/react#28102 - facebook/react#28161 - facebook/react#28193 - facebook/react#28195 - facebook/react#28189 - facebook/react#28160 - facebook/react#28096 - facebook/react#28183 - facebook/react#28125 - facebook/react#28157 - facebook/react#28115 - facebook/react#28124 - facebook/react#28163 - facebook/react#28164 - facebook/react#28150 - facebook/react#28159 - facebook/react#28069 - facebook/react#28110 - facebook/react#28148 - facebook/react#28116 - facebook/react#28099 - facebook/react#28100 - facebook/react#28147 - facebook/react#28128 - facebook/react#28126 - facebook/react#28139 - facebook/react#28140 - facebook/react#28141 - facebook/react#28142 - facebook/react#28113 - facebook/react#28129 - facebook/react#28114 - facebook/react#28053 - facebook/react#28091 - facebook/react#28087 - facebook/react#28112 - facebook/react#28086 - facebook/react#28101 - facebook/react#28106 - facebook/react#28117 - facebook/react#28118 - facebook/react#28105 - facebook/react#27883 - facebook/react#28111 - facebook/react#28095 - facebook/react#28108 - facebook/react#28090 - facebook/react#28089 - facebook/react#28076 - facebook/react#28074 - facebook/react#28103 - facebook/react#28098 - facebook/react#28097 - facebook/react#28068 - facebook/react#28093 - facebook/react#28094 - facebook/react#28073 - facebook/react#28084 - facebook/react#28063 - facebook/react#28085 - facebook/react#28083 - facebook/react#28065 - facebook/react#28061 - facebook/react#28077 - facebook/react#28075 - facebook/react#28078 - facebook/react#28050 - facebook/react#28011 - facebook/react#28055 - facebook/react#28066 - facebook/react#28067 - facebook/react#28010 - facebook/react#27993 - facebook/react#28052 - facebook/react#28060 - facebook/react#28059 - facebook/react#28034 - facebook/react#28033 - facebook/react#28004 - facebook/react#28051 - facebook/react#28012 - facebook/react#28001 - facebook/react#28002 - facebook/react#27995 - facebook/react#28006 - facebook/react#28005 - facebook/react#28007 - facebook/react#28008 - facebook/react#28009 - facebook/react#28000 - facebook/react#28003 - facebook/react#27997 - facebook/react#27240 - facebook/react#27977 - facebook/react#27940 - facebook/react#27939 - facebook/react#28090 - facebook/react#28089 - facebook/react#28076 - facebook/react#28074 - facebook/react#28103 - facebook/react#28098 - facebook/react#28097 - facebook/react#28068 - facebook/react#28093 - facebook/react#28094 - facebook/react#28073 - facebook/react#28084 - facebook/react#28063 - facebook/react#28085 - facebook/react#28083 - facebook/react#28065 - facebook/react#28061 - facebook/react#28077 - facebook/react#28075 - facebook/react#28078 - facebook/react#28050 - facebook/react#28011 - facebook/react#28055 - facebook/react#28066 - facebook/react#28067 - facebook/react#28010 - facebook/react#27993 - facebook/react#28052 - facebook/react#28060 - facebook/react#28059 - facebook/react#28034 - facebook/react#28033 - facebook/react#28004 - facebook/react#28051 - facebook/react#28012 - facebook/react#28001 - facebook/react#28002 - facebook/react#27995 - facebook/react#28006 - facebook/react#28005 - facebook/react#28007 - facebook/react#28008 - facebook/react#28009 - facebook/react#28000 - facebook/react#28003 - facebook/react#27997 - facebook/react#27240 - facebook/react#27977 - facebook/react#27940 - facebook/react#27939 Closes NEXT-2331
1 parent 4c53843 commit 2395557

File tree

227 files changed

+43592
-101955
lines changed

Some content is hidden

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

227 files changed

+43592
-101955
lines changed

‎package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,16 +198,16 @@
198198
"random-seed": "0.3.0",
199199
"react": "18.2.0",
200200
"react-17": "npm:[email protected]",
201-
"react-builtin": "npm:[email protected]60a927d04-20240113",
201+
"react-builtin": "npm:[email protected]2bc7d336a-20240205",
202202
"react-dom": "18.2.0",
203203
"react-dom-17": "npm:[email protected]",
204-
"react-dom-builtin": "npm:[email protected]60a927d04-20240113",
205-
"react-dom-experimental-builtin": "npm:[email protected]60a927d04-20240113",
206-
"react-experimental-builtin": "npm:[email protected]60a927d04-20240113",
207-
"react-server-dom-turbopack": "18.3.0-canary-60a927d04-20240113",
208-
"react-server-dom-turbopack-experimental": "npm:[email protected]60a927d04-20240113",
209-
"react-server-dom-webpack": "18.3.0-canary-60a927d04-20240113",
210-
"react-server-dom-webpack-experimental": "npm:[email protected]60a927d04-20240113",
204+
"react-dom-builtin": "npm:[email protected]2bc7d336a-20240205",
205+
"react-dom-experimental-builtin": "npm:[email protected]2bc7d336a-20240205",
206+
"react-experimental-builtin": "npm:[email protected]2bc7d336a-20240205",
207+
"react-server-dom-turbopack": "18.3.0-canary-2bc7d336a-20240205",
208+
"react-server-dom-turbopack-experimental": "npm:[email protected]2bc7d336a-20240205",
209+
"react-server-dom-webpack": "18.3.0-canary-2bc7d336a-20240205",
210+
"react-server-dom-webpack-experimental": "npm:[email protected]2bc7d336a-20240205",
211211
"react-ssr-prepass": "1.0.8",
212212
"react-virtualized": "9.22.3",
213213
"relay-compiler": "13.0.2",
@@ -217,8 +217,8 @@
217217
"resolve-from": "5.0.0",
218218
"sass": "1.54.0",
219219
"satori": "0.10.9",
220-
"scheduler-builtin": "npm:[email protected]60a927d04-20240113",
221-
"scheduler-experimental-builtin": "npm:[email protected]60a927d04-20240113",
220+
"scheduler-builtin": "npm:[email protected]2bc7d336a-20240205",
221+
"scheduler-experimental-builtin": "npm:[email protected]2bc7d336a-20240205",
222222
"seedrandom": "3.0.5",
223223
"selenium-webdriver": "4.0.0-beta.4",
224224
"semver": "7.3.7",

‎packages/next-swc/crates/next-core/src/next_import_map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ async fn rsc_aliases(
659659

660660
if runtime == NextRuntime::Edge {
661661
if matches!(ty, ServerContextType::AppRSC { .. }) {
662-
alias["react"] = format!("next/dist/compiled/react{react_channel}/react.shared-subset");
662+
alias["react"] = format!("next/dist/compiled/react{react_channel}/react.react-server");
663663
}
664664
// Use server rendering stub for RSC and SSR
665665
// x-ref: https://github.com/facebook/react/pull/25436

‎packages/next/src/build/create-compiler-aliases.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ export function createRSCAliases(
290290
if (layer === WEBPACK_LAYERS.reactServerComponents) {
291291
alias[
292292
'react$'
293-
] = `next/dist/compiled/react${bundledReactChannel}/react.shared-subset`
293+
] = `next/dist/compiled/react${bundledReactChannel}/react.react-server`
294294
}
295295
// Use server rendering stub for RSC and SSR
296296
// x-ref: https://github.com/facebook/react/pull/25436

0 commit comments

Comments
 (0)