Skip to content

Commit fc6911a

Browse files
sammy-SCsammy-SC
committed
Merge branch 'main' into offscreen-add-attach
2 parents faab18c + f0bba2d commit fc6911a

File tree

156 files changed

+2923
-25576
lines changed

Some content is hidden

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

156 files changed

+2923
-25576
lines changed

‎.circleci/config.yml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -462,35 +462,6 @@ jobs:
462462
cp ./scripts/release/ci-npmrc ~/.npmrc
463463
scripts/release/publish.js --ci --tags << parameters.dist_tag >>
464464
465-
# We don't always keep the reconciler forks in sync (otherwise it we wouldn't
466-
# have forked it) but during periods when they are meant to be in sync, we
467-
# use this job to confirm there are no differences.
468-
sync_reconciler_forks:
469-
docker: *docker
470-
environment: *environment
471-
steps:
472-
- checkout
473-
- *restore_node_modules
474-
- run:
475-
name: Fetch revisions that contain an intentional fork
476-
# This will fetch each revision listed in the `forked-revisions` file,
477-
# which may be necessary if it's not part of main. For example, it
478-
# may have been part of a PR branch that was squashed on merge.
479-
command: |
480-
cut -d " " -f 1 scripts/merge-fork/forked-revisions | xargs -r git fetch origin
481-
- run:
482-
name: Revert forked revisions
483-
# This will revert the changes without committing. At the end, it's
484-
# expected that both forks will be identical.
485-
command: |
486-
cut -d " " -f 1 scripts/merge-fork/forked-revisions | xargs -r git revert --no-commit
487-
- run:
488-
name: Confirm reconciler forks are the same
489-
command: |
490-
yarn replace-fork
491-
git diff --quiet || (echo "Reconciler forks are not the same! Run yarn replace-fork. Or, if this was intentional, add the commit SHA to scripts/merge-fork/forked-revisions." && false)
492-
493-
494465
workflows:
495466
version: 2
496467

@@ -506,11 +477,6 @@ workflows:
506477
- yarn_flow:
507478
requires:
508479
- setup
509-
# NOTE: This job is only enabled when we want the forks to be in sync.
510-
# When the forks intentionally diverge, comment out the job to disable it.
511-
- sync_reconciler_forks:
512-
requires:
513-
- setup
514480
- check_generated_fizz_runtime:
515481
requires:
516482
- setup

‎.eslintrc.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,6 @@ module.exports = {
112112
'react-internal/no-to-warn-dev-within-to-throw': ERROR,
113113
'react-internal/warning-args': ERROR,
114114
'react-internal/no-production-logging': ERROR,
115-
'react-internal/no-cross-fork-imports': ERROR,
116-
'react-internal/no-cross-fork-types': [
117-
ERROR,
118-
{
119-
old: [],
120-
new: [],
121-
},
122-
],
123115
},
124116

125117
overrides: [

‎.github/workflows/commit_artifacts.yml

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,36 +48,56 @@ jobs:
4848
ref: context.sha
4949
});
5050
for (const status of res.data) {
51-
if (
52-
status.context === 'ci/circleci: process_artifacts_combined' &&
53-
status.state === 'success'
54-
) {
55-
// The status does not include a build ID, but we can extract it
56-
// from the URL. I couldn't find a better way to do this.
57-
const ciBuildId = /\/facebook\/react\/([0-9]+)/.exec(
58-
status.target_url,
59-
)[1];
60-
console.log(`CircleCI build id found: ${ciBuildId}`);
61-
if (Number.parseInt(ciBuildId, 10) + '' === ciBuildId) {
62-
artifactsUrl =
63-
`https://circleci.com/api/v1.1/project/github/facebook/react/${ciBuildId}/artifacts`;
64-
break spinloop;
51+
if (/process_artifacts_combined/.test(status.context)) {
52+
switch (status.state) {
53+
case 'pending': {
54+
console.log(`${status.context} is still pending`);
55+
break;
56+
}
57+
case 'failure':
58+
case 'error': {
59+
throw new Error(`${status.context} has failed or errored`);
60+
}
61+
case 'success': {
62+
// The status does not include a build ID, but we can extract it
63+
// from the URL. I couldn't find a better way to do this.
64+
const ciBuildId = /\/facebook\/react\/([0-9]+)/.exec(
65+
status.target_url,
66+
)[1];
67+
console.log(`CircleCI build id found: ${ciBuildId}`);
68+
if (Number.parseInt(ciBuildId, 10) + '' === ciBuildId) {
69+
artifactsUrl =
70+
`https://circleci.com/api/v1.1/project/github/facebook/react/${ciBuildId}/artifacts`;
71+
break spinloop;
72+
} else {
73+
throw new Error(`${ciBuildId} isn't a number`);
74+
}
75+
break;
76+
}
77+
default: {
78+
throw new Error(`Unhandled status state: ${status.state}`);
79+
break;
80+
}
6581
}
6682
}
6783
}
6884
iter++;
6985
console.log("Sleeping for 60s...");
7086
await sleep(60_000);
7187
}
72-
const res = await fetch(artifactsUrl);
73-
const data = await res.json();
74-
for (const artifact of data) {
75-
if (artifact.path === 'build.tgz') {
76-
console.log(`Downloading and unzipping ${artifact.url}`);
77-
await execHelper(
78-
`curl -L ${artifact.url} | tar -xvz`
79-
);
88+
if (artifactsUrl != null) {
89+
const res = await fetch(artifactsUrl);
90+
const data = await res.json();
91+
for (const artifact of data) {
92+
if (artifact.path === 'build.tgz') {
93+
console.log(`Downloading and unzipping ${artifact.url}`);
94+
await execHelper(
95+
`curl -L ${artifact.url} | tar -xvz`
96+
);
97+
}
8098
}
99+
} else {
100+
process.exitCode = 1;
81101
}
82102
- name: Move relevant files into compiled
83103
run: |

‎fixtures/blocks/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3390,9 +3390,9 @@ decamelize@^1.2.0:
33903390
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
33913391

33923392
decode-uri-component@^0.2.0:
3393-
version "0.2.0"
3394-
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
3395-
integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
3393+
version "0.2.2"
3394+
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
3395+
integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
33963396

33973397
decompress-response@^3.3.0:
33983398
version "3.3.0"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2294,9 +2294,9 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
22942294
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
22952295

22962296
decode-uri-component@^0.2.0:
2297-
version "0.2.0"
2298-
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
2299-
integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
2297+
version "0.2.2"
2298+
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
2299+
integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
23002300

23012301
deep-equal@^1.0.1:
23022302
version "1.1.1"

‎fixtures/dom/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,9 +2274,9 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
22742274
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
22752275

22762276
decode-uri-component@^0.2.0:
2277-
version "0.2.0"
2278-
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
2279-
integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
2277+
version "0.2.2"
2278+
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
2279+
integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
22802280

22812281
deep-equal@^1.0.1:
22822282
version "1.1.1"

‎fixtures/fizz/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,9 +2149,9 @@ decamelize@^1.2.0:
21492149
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
21502150

21512151
decode-uri-component@^0.2.0:
2152-
version "0.2.0"
2153-
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
2154-
integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
2152+
version "0.2.2"
2153+
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
2154+
integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
21552155

21562156
decompress-response@^3.3.0:
21572157
version "3.3.0"

‎fixtures/legacy-jsx-runtimes/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,9 +1156,9 @@ decimal.js@^10.2.1:
11561156
integrity sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg==
11571157

11581158
decode-uri-component@^0.2.0:
1159-
version "0.2.0"
1160-
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
1161-
integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
1159+
version "0.2.2"
1160+
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
1161+
integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
11621162

11631163
deep-is@~0.1.3:
11641164
version "0.1.4"

‎fixtures/ssr/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1949,9 +1949,9 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
19491949
integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
19501950

19511951
decode-uri-component@^0.2.0:
1952-
version "0.2.0"
1953-
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
1954-
integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
1952+
version "0.2.2"
1953+
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
1954+
integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
19551955

19561956
deep-extend@^0.6.0:
19571957
version "0.6.0"

‎package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@
140140
"prettier": "node ./scripts/prettier/index.js write-changed",
141141
"prettier-all": "node ./scripts/prettier/index.js write",
142142
"version-check": "node ./scripts/tasks/version-check.js",
143-
"merge-fork": "node ./scripts/merge-fork/merge-fork.js",
144-
"replace-fork": "node ./scripts/merge-fork/replace-fork.js",
145143
"publish-prereleases": "node ./scripts/release/publish-using-ci-workflow.js",
146144
"download-build": "node ./scripts/release/download-experimental-build.js",
147145
"download-build-for-head": "node ./scripts/release/download-experimental-build.js --commit=$(git rev-parse HEAD)",

0 commit comments

Comments
 (0)