Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Update React from 14898b6a9 to c3048aab4 #64798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 25, 2024
Merged

Update React from 14898b6a9 to c3048aab4 #64798

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0e9134c
Ensure experimental versions don't use Canary release channel
eps1lon Apr 19, 2024
5f5d5f4
Update React from 14898b6a9 to c3048aab4.
eps1lon Apr 19, 2024
7d6640c
Update warning messages
eps1lon Apr 23, 2024
4275064
Update onCaughtError interceptor
eps1lon Apr 24, 2024
fd04461
Fix error overlay
eps1lon Apr 24, 2024
fbd6174
Ensure compiled React is not treated as an external
eps1lon Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Ensure experimental versions don't use Canary release channel
  • Loading branch information
@eps1lon
eps1lon committed Apr 24, 2024
commit 0e9134c7a6aece6a24937594b6ef69e8ed9b8c06
7 changes: 4 additions & 3 deletions scripts/sync-react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ async function sync(channel = 'next') {
newVersionStr = stdout.trim()
}

const newVersionInfo = extractInfoFromReactCanaryVersion(newVersionStr)
const newVersionInfo = extractInfoFromReactVersion(newVersionStr)
if (!newVersionInfo) {
throw new Error(
`New react version does not match expected format: ${newVersionStr}
Expand All @@ -50,6 +50,7 @@ Or, run this command with no arguments to use the most recently published versio
`
)
}
newVersionInfo.releaseLabel = channel
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise the script made react-experimental-builtin point to the Canary release channel.


const cwd = process.cwd()
const pkgJson = JSON.parse(
Expand All @@ -60,7 +61,7 @@ Or, run this command with no arguments to use the most recently published versio
useExperimental ? 'react-experimental-builtin' : 'react-builtin'
].replace(/^npm:react@/, '')

const baseVersionInfo = extractInfoFromReactCanaryVersion(baseVersionStr)
const baseVersionInfo = extractInfoFromReactVersion(baseVersionStr)
if (!baseVersionInfo) {
throw new Error(
'Base react version does not match expected format: ' + baseVersionStr
Expand Down Expand Up @@ -175,7 +176,7 @@ function readStringArg(argv, argName) {
return argIndex === -1 ? null : argv[argIndex + 1]
}

function extractInfoFromReactCanaryVersion(reactCanaryVersion) {
function extractInfoFromReactVersion(reactCanaryVersion) {
const match = reactCanaryVersion.match(
/(?<semverVersion>.*)-(?<releaseLabel>.*)-(?<sha>.*)-(?<dateString>.*)$/
)
Expand Down