Skip to content

Commit 9ed1e91

Browse files
authored
Merge branch 'main' into add-bun-fizz-server
2 parents 07d5fef + f31005d commit 9ed1e91

File tree

79 files changed

+2741
-1410
lines changed

Some content is hidden

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

79 files changed

+2741
-1410
lines changed

fixtures/fizz/yarn.lock

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3267,9 +3267,9 @@ loader-runner@^2.4.0:
32673267
integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
32683268

32693269
loader-utils@^1.2.3, loader-utils@^1.4.0:
3270-
version "1.4.0"
3271-
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
3272-
integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
3270+
version "1.4.2"
3271+
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
3272+
integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
32733273
dependencies:
32743274
big.js "^5.2.2"
32753275
emojis-list "^3.0.0"
@@ -3460,7 +3460,12 @@ minimatch@^3.0.4:
34603460
dependencies:
34613461
brace-expansion "^1.1.7"
34623462

3463-
minimist@^1.2.0, minimist@^1.2.6:
3463+
minimist@^1.2.0:
3464+
version "1.2.7"
3465+
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
3466+
integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
3467+
3468+
minimist@^1.2.6:
34643469
version "1.2.6"
34653470
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
34663471
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

fixtures/flight/yarn.lock

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3192,6 +3192,7 @@ bfj@^7.0.2:
31923192
big.js@^5.2.2:
31933193
version "5.2.2"
31943194
resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
3195+
integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
31953196

31963197
binary-extensions@^2.0.0:
31973198
version "2.1.0"
@@ -6399,20 +6400,7 @@ json5@^1.0.1:
63996400
dependencies:
64006401
minimist "^1.2.0"
64016402

6402-
json5@^2.1.0:
6403-
version "2.1.1"
6404-
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
6405-
dependencies:
6406-
minimist "^1.2.0"
6407-
6408-
json5@^2.1.2:
6409-
version "2.1.3"
6410-
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
6411-
integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
6412-
dependencies:
6413-
minimist "^1.2.5"
6414-
6415-
json5@^2.2.0, json5@^2.2.1:
6403+
json5@^2.1.0, json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
64166404
version "2.2.1"
64176405
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
64186406
integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
@@ -6507,9 +6495,9 @@ loader-runner@^4.2.0:
65076495
integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
65086496

65096497
loader-utils@^2.0.0:
6510-
version "2.0.0"
6511-
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
6512-
integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
6498+
version "2.0.4"
6499+
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
6500+
integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
65136501
dependencies:
65146502
big.js "^5.2.2"
65156503
emojis-list "^3.0.0"
@@ -6783,11 +6771,6 @@ minimist@^1.2.0:
67836771
version "1.2.0"
67846772
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
67856773

6786-
minimist@^1.2.5:
6787-
version "1.2.5"
6788-
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
6789-
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
6790-
67916774
minimist@^1.2.6:
67926775
version "1.2.6"
67936776
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"

packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,11 @@ describe('ReactHooksInspectionIntegration', () => {
898898

899899
await LazyFoo;
900900

901-
Scheduler.unstable_flushAll();
901+
expect(() => {
902+
Scheduler.unstable_flushAll();
903+
}).toErrorDev([
904+
'Foo: Support for defaultProps will be removed from function components in a future major release. Use JavaScript default parameters instead.',
905+
]);
902906

903907
const childFiber = renderer.root._currentFiber();
904908
const tree = ReactDebugTools.inspectHooksOfFiber(childFiber);

packages/react-devtools-shared/src/__tests__/TimelineProfiler-test.js

Lines changed: 220 additions & 220 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)