Skip to content

Commit 1b99357

Browse files
authored
Merge branch 'main' into patch1
2 parents 82c587b + 2acfb7b commit 1b99357

File tree

856 files changed

+65771
-49121
lines changed

Some content is hidden

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

856 files changed

+65771
-49121
lines changed

.circleci/config.yml

Lines changed: 67 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ jobs:
8484
- run: node ./scripts/prettier/index
8585
- run: node ./scripts/tasks/eslint
8686
- run: ./scripts/circleci/check_license.sh
87-
- run: ./scripts/circleci/check_modules.sh
8887
- run: ./scripts/circleci/test_print_warnings.sh
8988

9089
yarn_flow:
@@ -97,6 +96,16 @@ jobs:
9796
- setup_node_modules
9897
- run: node ./scripts/tasks/flow-ci
9998

99+
100+
yarn_flags:
101+
docker: *docker
102+
environment: *environment
103+
104+
steps:
105+
- checkout
106+
- setup_node_modules
107+
- run: yarn flags
108+
100109
scrape_warning_messages:
101110
docker: *docker
102111
environment: *environment
@@ -106,8 +115,8 @@ jobs:
106115
- setup_node_modules
107116
- run:
108117
command: |
109-
mkdir -p ./build
110-
node ./scripts/print-warnings/print-warnings.js > build/WARNINGS
118+
mkdir -p ./build/__test_utils__
119+
node ./scripts/print-warnings/print-warnings.js > build/__test_utils__/ReactAllWarnings.js
111120
- persist_to_workspace:
112121
root: .
113122
paths:
@@ -236,6 +245,53 @@ jobs:
236245
RELEASE_CHANNEL: experimental
237246
command: ./scripts/circleci/run_devtools_e2e_tests.js
238247

248+
run_fixtures_flight_tests:
249+
docker:
250+
- image: cimg/openjdk:20.0-node
251+
environment: *environment
252+
steps:
253+
- checkout
254+
- attach_workspace:
255+
at: .
256+
# Fixture copies some built packages from the workroot after install.
257+
# That means dependencies of the built packages are not installed.
258+
# We need to install dependencies of the workroot to fulfill all dependency constraints
259+
- setup_node_modules
260+
- restore_cache:
261+
name: Restore yarn cache of fixture
262+
keys:
263+
- v2-yarn_cache_fixtures_flight-{{ arch }}-{{ checksum "yarn.lock" }}
264+
- run:
265+
name: Install fixture dependencies
266+
working_directory: fixtures/flight
267+
command: |
268+
yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
269+
if [ $? -ne 0 ]; then
270+
yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
271+
fi
272+
- save_cache:
273+
name: Save yarn cache of fixture
274+
key: v2-yarn_cache_fixtures_flight-{{ arch }}-{{ checksum "yarn.lock" }}
275+
paths:
276+
- ~/.cache/yarn
277+
- run:
278+
working_directory: fixtures/flight
279+
name: Playwright install deps
280+
command: |
281+
npx playwright install
282+
sudo npx playwright install-deps
283+
- run:
284+
name: Run tests
285+
working_directory: fixtures/flight
286+
command: yarn test
287+
environment:
288+
# Otherwise the webserver is a blackbox
289+
DEBUG: pw:webserver
290+
- store_artifacts:
291+
path: fixtures/flight/playwright-report
292+
- store_artifacts:
293+
path: fixtures/flight/test-results
294+
239295
run_devtools_tests_for_versions:
240296
docker: *docker
241297
environment: *environment
@@ -373,18 +429,6 @@ jobs:
373429
yarn predev
374430
yarn test --maxWorkers=2
375431
376-
test_fuzz:
377-
docker: *docker
378-
environment: *environment
379-
steps:
380-
- checkout
381-
- setup_node_modules
382-
- run:
383-
name: Run fuzz tests
384-
command: |
385-
FUZZ_TEST_SEED=$RANDOM yarn test fuzz --ci
386-
FUZZ_TEST_SEED=$RANDOM yarn test --prod fuzz --ci
387-
388432
publish_prerelease:
389433
parameters:
390434
commit_sha:
@@ -412,6 +456,11 @@ workflows:
412456
build_and_test:
413457
unless: << pipeline.parameters.prerelease_commit_sha >>
414458
jobs:
459+
- yarn_flags:
460+
filters:
461+
branches:
462+
ignore:
463+
- builds/facebook-www
415464
- yarn_flow:
416465
filters:
417466
branches:
@@ -528,19 +577,9 @@ workflows:
528577
- run_devtools_e2e_tests:
529578
requires:
530579
- build_devtools_and_process_artifacts
531-
532-
fuzz_tests:
533-
unless: << pipeline.parameters.prerelease_commit_sha >>
534-
triggers:
535-
- schedule:
536-
# Fuzz tests run hourly
537-
cron: "0 * * * *"
538-
filters:
539-
branches:
540-
only:
541-
- main
542-
jobs:
543-
- test_fuzz
580+
- run_fixtures_flight_tests:
581+
requires:
582+
- yarn_build
544583

545584
devtools_regression_tests:
546585
unless: << pipeline.parameters.prerelease_commit_sha >>

.eslintrc.js

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ module.exports = {
327327
'packages/react-server-dom-esm/**/*.js',
328328
'packages/react-server-dom-webpack/**/*.js',
329329
'packages/react-server-dom-turbopack/**/*.js',
330+
'packages/react-server-dom-fb/**/*.js',
330331
'packages/react-test-renderer/**/*.js',
331332
'packages/react-debug-tools/**/*.js',
332333
'packages/react-devtools-extensions/**/*.js',
@@ -380,6 +381,13 @@ module.exports = {
380381
'jest/valid-expect-in-promise': ERROR,
381382
},
382383
},
384+
{
385+
// disable no focused tests for test setup helper files even if they are inside __tests__ directory
386+
files: ['**/setupTests.js'],
387+
rules: {
388+
'jest/no-focused-tests': OFF,
389+
},
390+
},
383391
{
384392
files: [
385393
'**/__tests__/**/*.js',
@@ -419,6 +427,7 @@ module.exports = {
419427
files: ['packages/react-native-renderer/**/*.js'],
420428
globals: {
421429
nativeFabricUIManager: 'readonly',
430+
RN$enableMicrotasksInReact: 'readonly',
422431
},
423432
},
424433
{
@@ -441,6 +450,21 @@ module.exports = {
441450
TaskController: 'readonly',
442451
},
443452
},
453+
{
454+
files: ['packages/react-devtools-extensions/**/*.js'],
455+
globals: {
456+
__IS_CHROME__: 'readonly',
457+
__IS_FIREFOX__: 'readonly',
458+
__IS_EDGE__: 'readonly',
459+
__IS_INTERNAL_VERSION__: 'readonly',
460+
},
461+
},
462+
{
463+
files: ['packages/react-devtools-shared/**/*.js'],
464+
globals: {
465+
__IS_INTERNAL_VERSION__: 'readonly',
466+
},
467+
},
444468
],
445469

446470
env: {
@@ -495,7 +519,6 @@ module.exports = {
495519
React$Node: 'readonly',
496520
React$Portal: 'readonly',
497521
React$Ref: 'readonly',
498-
React$StatelessFunctionalComponent: 'readonly',
499522
ReadableStreamController: 'readonly',
500523
RequestInfo: 'readonly',
501524
RequestOptions: 'readonly',
@@ -523,6 +546,7 @@ module.exports = {
523546
trustedTypes: 'readonly',
524547
IS_REACT_ACT_ENVIRONMENT: 'readonly',
525548
AsyncLocalStorage: 'readonly',
549+
async_hooks: 'readonly',
526550
globalThis: 'readonly',
527551
},
528552
};

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
contact_links:
22
- name: 📃 Documentation Issue
3-
url: https://github.com/reactjs/reactjs.org/issues/new
3+
url: https://github.com/reactjs/react.dev/issues/new/choose
44
about: This issue tracker is not for documentation issues. Please file documentation issues here.
55
- name: 🤔 Questions and Help
66
url: https://reactjs.org/community/support.html

.github/dependabot.yml

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "npm"
4+
directory: "/fixtures/art"
5+
schedule:
6+
interval: "weekly"
7+
open-pull-requests-limit: 0
8+
- package-ecosystem: "npm"
9+
directory: "/fixtures/attribute-behavior"
10+
schedule:
11+
interval: "weekly"
12+
open-pull-requests-limit: 0
13+
- package-ecosystem: "npm"
14+
directory: "/fixtures/concurrent"
15+
schedule:
16+
interval: "weekly"
17+
open-pull-requests-limit: 0
18+
- package-ecosystem: "npm"
19+
directory: "/fixtures/devtools"
20+
schedule:
21+
interval: "weekly"
22+
open-pull-requests-limit: 0
23+
- package-ecosystem: "npm"
24+
directory: "/fixtures/dom"
25+
schedule:
26+
interval: "weekly"
27+
open-pull-requests-limit: 0
28+
- package-ecosystem: "npm"
29+
directory: "/fixtures/eslint"
30+
schedule:
31+
interval: "weekly"
32+
open-pull-requests-limit: 0
33+
- package-ecosystem: "npm"
34+
directory: "/fixtures/expiration"
35+
schedule:
36+
interval: "weekly"
37+
open-pull-requests-limit: 0
38+
- package-ecosystem: "npm"
39+
directory: "/fixtures/fiber-debugger"
40+
schedule:
41+
interval: "weekly"
42+
open-pull-requests-limit: 0
43+
- package-ecosystem: "npm"
44+
directory: "/fixtures/fiber-triangle"
45+
schedule:
46+
interval: "weekly"
47+
open-pull-requests-limit: 0
48+
- package-ecosystem: "npm"
49+
directory: "/fixtures/fizz"
50+
schedule:
51+
interval: "weekly"
52+
open-pull-requests-limit: 0
53+
- package-ecosystem: "npm"
54+
directory: "/fixtures/fizz-ssr-browser"
55+
schedule:
56+
interval: "weekly"
57+
open-pull-requests-limit: 0
58+
- package-ecosystem: "npm"
59+
directory: "/fixtures/flight"
60+
schedule:
61+
interval: "weekly"
62+
open-pull-requests-limit: 0
63+
- package-ecosystem: "npm"
64+
directory: "/fixtures/flight-browser"
65+
schedule:
66+
interval: "weekly"
67+
open-pull-requests-limit: 0
68+
- package-ecosystem: "npm"
69+
directory: "/fixtures/flight-esm"
70+
schedule:
71+
interval: "weekly"
72+
open-pull-requests-limit: 0
73+
- package-ecosystem: "npm"
74+
directory: "/fixtures/legacy-jsx-runtimes"
75+
schedule:
76+
interval: "weekly"
77+
open-pull-requests-limit: 0
78+
- package-ecosystem: "npm"
79+
directory: "/fixtures/nesting"
80+
schedule:
81+
interval: "weekly"
82+
open-pull-requests-limit: 0
83+
- package-ecosystem: "npm"
84+
directory: "/fixtures/packaging"
85+
schedule:
86+
interval: "weekly"
87+
open-pull-requests-limit: 0
88+
- package-ecosystem: "npm"
89+
directory: "/fixtures/scheduler"
90+
schedule:
91+
interval: "weekly"
92+
open-pull-requests-limit: 0
93+
- package-ecosystem: "npm"
94+
directory: "/fixtures/ssr"
95+
schedule:
96+
interval: "weekly"
97+
open-pull-requests-limit: 0
98+
- package-ecosystem: "npm"
99+
directory: "/fixtures/ssr-2"
100+
schedule:
101+
interval: "weekly"
102+
open-pull-requests-limit: 0
103+
- package-ecosystem: "npm"
104+
directory: "/fixtures/stacks"
105+
schedule:
106+
interval: "weekly"
107+
open-pull-requests-limit: 0

.github/stale.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)