Skip to content

Commit 66596e2

Browse files
GrinZeroGrinZero
committed
Merge branch 'main' of ssh://github.com/GrinZero/react
* 'main' of ssh://github.com/GrinZero/react: (51 commits) Flow: add simple explicit export types to Devtools (facebook#25251) [react devtools][easy] Centralize calls to patchConsoleUsingWindowValues (facebook#25222) Unwind the current workInProgress if it's suspended (facebook#25247) Add early exit to strict mode (facebook#25235) fix: prettier ignore removed and fixed (facebook#24811) Flow: enable unsafe-addition error (facebook#25242) Flow: upgrade to 0.132 (facebook#25244) Flow: fix Fiber typed as any (facebook#25241) Flow: ReactFiberHotReloading recursive type (facebook#25225) Add some test coverage for some error cases (facebook#25240) experimental_use(context) for server components and ssr (facebook#25226) Flow: upgrade to 0.131 (facebook#25224) Prevent infinite re-renders in StrictMode + Offscreen (facebook#25203) Flow: remove explicit object syntax (facebook#25223) Flow: upgrade to 0.127 (facebook#25221) Flow: enable exact_by_default (facebook#25220) [react devtools] Don't check for NODE_ENV==='test' because it never is (facebook#25186) [react devtools][easy] Change variable names, etc. (facebook#25211) Bump async from 2.6.3 to 2.6.4 in /fixtures/concurrent/time-slicing (facebook#24443) Flow: implicit-inexact-object=error (facebook#25210) ...
2 parents 0e3fa44 + 24dc573 commit 66596e2

379 files changed

Lines changed: 3777 additions & 2411 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.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
React is a JavaScript library for building user interfaces.
44

55
* **Declarative:** React makes it painless to create interactive UIs. Design simple views for each state in your application, and React will efficiently update and render just the right components when your data changes. Declarative views make your code more predictable, simpler to understand, and easier to debug.
6-
* **Component-Based:** Build encapsulated components that manage their state, then compose them to make complex UIs. Since component logic is written in JavaScript instead of templates, you can easily pass rich data through your app and keep the state out of the DOM.
6+
* **Component-Based:** Build encapsulated components that manage their own state, then compose them to make complex UIs. Since component logic is written in JavaScript instead of templates, you can easily pass rich data through your app and keep the state out of the DOM.
77
* **Learn Once, Write Anywhere:** We don't make assumptions about the rest of your technology stack, so you can develop new features in React without rewriting existing code. React can also render on the server using Node and power mobile apps using [React Native](https://reactnative.dev/).
88

99
[Learn how to use React in your project](https://reactjs.org/docs/getting-started.html).

‎ReactVersions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const ReactVersion = '18.3.0';
2525
const nextChannelLabel = 'next';
2626

2727
const stablePackages = {
28-
'eslint-plugin-react-hooks': '4.7.0',
28+
'eslint-plugin-react-hooks': '5.0.0',
2929
'jest-react': '0.15.0',
3030
react: ReactVersion,
3131
'react-art': ReactVersion,

‎dangerfile.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,16 @@ const header = `
8686

8787
function row(result, baseSha, headSha) {
8888
const diffViewUrl = `https://react-builds.vercel.app/commits/${headSha}/files/${result.path}?compare=${baseSha}`;
89-
// prettier-ignore
90-
return `| [${result.path}](${diffViewUrl}) | **${change(result.change)}** | ${kbs(result.baseSize)} | ${kbs(result.headSize)} | ${change(result.changeGzip)} | ${kbs(result.baseSizeGzip)} | ${kbs(result.headSizeGzip)}`;
89+
const rowArr = [
90+
`| [${result.path}](${diffViewUrl})`,
91+
`**${change(result.change)}**`,
92+
`${kbs(result.baseSize)}`,
93+
`${kbs(result.headSize)}`,
94+
`${change(result.changeGzip)}`,
95+
`${kbs(result.baseSizeGzip)}`,
96+
`${kbs(result.headSizeGzip)}`,
97+
];
98+
return rowArr.join(' | ');
9199
}
92100

93101
(async function() {

‎fixtures/blocks/yarn.lock‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,9 +1915,9 @@ async-limiter@~1.0.0:
19151915
integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
19161916

19171917
async@^2.6.2:
1918-
version "2.6.3"
1919-
resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
1920-
integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
1918+
version "2.6.4"
1919+
resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
1920+
integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
19211921
dependencies:
19221922
lodash "^4.17.14"
19231923

@@ -2355,9 +2355,9 @@ bser@2.1.1:
23552355
node-int64 "^0.4.0"
23562356

23572357
buffer-from@^1.0.0:
2358-
version "1.1.1"
2359-
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
2360-
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
2358+
version "1.1.2"
2359+
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
2360+
integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
23612361

23622362
buffer-indexof@^1.0.0:
23632363
version "1.1.1"
@@ -6540,9 +6540,9 @@ lodash.uniq@^4.5.0:
65406540
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
65416541

65426542
lodash@4, "lodash@>=3.5 <5", lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5:
6543-
version "4.17.15"
6544-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
6545-
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
6543+
version "4.17.21"
6544+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
6545+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
65466546

65476547
loglevel@^1.6.6:
65486548
version "1.6.7"
@@ -9646,9 +9646,9 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
96469646
urix "^0.1.0"
96479647

96489648
source-map-support@^0.5.6, source-map-support@~0.5.12:
9649-
version "0.5.16"
9650-
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
9651-
integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
9649+
version "0.5.21"
9650+
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
9651+
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
96529652
dependencies:
96539653
buffer-from "^1.0.0"
96549654
source-map "^0.6.0"
@@ -10117,9 +10117,9 @@ terser-webpack-plugin@^1.4.3:
1011710117
worker-farm "^1.7.0"
1011810118

1011910119
terser@^4.1.2, terser@^4.4.3, terser@^4.6.3:
10120-
version "4.6.7"
10121-
resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz#478d7f9394ec1907f0e488c5f6a6a9a2bad55e72"
10122-
integrity sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==
10120+
version "4.8.1"
10121+
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
10122+
integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
1012310123
dependencies:
1012410124
commander "^2.20.0"
1012510125
source-map "~0.6.1"

‎fixtures/concurrent/time-slicing/yarn.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,9 @@ async-each@^1.0.1:
341341
integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
342342

343343
async@^2.1.2, async@^2.1.4, async@^2.4.1, async@^2.6.2:
344-
version "2.6.3"
345-
resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
346-
integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
344+
version "2.6.4"
345+
resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
346+
integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
347347
dependencies:
348348
lodash "^4.17.14"
349349

‎fixtures/dom/yarn.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,9 @@ async-each@^1.0.1:
405405
integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
406406

407407
async@^2.1.2, async@^2.1.4, async@^2.4.1, async@^2.6.2:
408-
version "2.6.3"
409-
resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
410-
integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
408+
version "2.6.4"
409+
resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
410+
integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
411411
dependencies:
412412
lodash "^4.17.14"
413413

@@ -5116,9 +5116,9 @@ lodash.uniq@^4.5.0:
51165116
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
51175117

51185118
"lodash@>=3.5 <5", lodash@^4.15.0, lodash@^4.17.14, lodash@^4.17.2, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0:
5119-
version "4.17.20"
5120-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
5121-
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
5119+
version "4.17.21"
5120+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
5121+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
51225122

51235123
loglevel@^1.4.1:
51245124
version "1.7.1"

‎fixtures/fizz/yarn.lock‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3171,7 +3171,7 @@ isobject@^3.0.0, isobject@^3.0.1:
31713171
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
31723172
integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
31733173

3174-
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
3174+
js-tokens@^4.0.0:
31753175
version "4.0.0"
31763176
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
31773177
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
@@ -3295,13 +3295,6 @@ lodash@^4.17.15, lodash@^4.17.19:
32953295
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
32963296
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
32973297

3298-
loose-envify@^1.1.0:
3299-
version "1.4.0"
3300-
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
3301-
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
3302-
dependencies:
3303-
js-tokens "^3.0.0 || ^4.0.0"
3304-
33053298
lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
33063299
version "1.0.1"
33073300
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
@@ -4087,7 +4080,6 @@ rc@^1.2.8:
40874080

40884081
"react-dom@link:../../build/node_modules/react-dom":
40894082
version "0.0.0"
4090-
uid ""
40914083

40924084
react-error-boundary@^3.1.3:
40934085
version "3.1.4"
@@ -4098,7 +4090,6 @@ react-error-boundary@^3.1.3:
40984090

40994091
"react@link:../../build/node_modules/react":
41004092
version "0.0.0"
4101-
uid ""
41024093

41034094
read-pkg@^4.0.1:
41044095
version "4.0.1"
@@ -4357,13 +4348,6 @@ safe-regex@^1.1.0:
43574348
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
43584349
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
43594350

4360-
scheduler@^0.21.0:
4361-
version "0.21.0"
4362-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820"
4363-
integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==
4364-
dependencies:
4365-
loose-envify "^1.1.0"
4366-
43674351
schema-utils@^1.0.0:
43684352
version "1.0.0"
43694353
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -4766,9 +4750,9 @@ terser-webpack-plugin@^1.4.3:
47664750
worker-farm "^1.7.0"
47674751

47684752
terser@^4.1.2:
4769-
version "4.8.0"
4770-
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
4771-
integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
4753+
version "4.8.1"
4754+
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
4755+
integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
47724756
dependencies:
47734757
commander "^2.20.0"
47744758
source-map "~0.6.1"

0 commit comments

Comments
 (0)