Skip to content

Commit 4bd3b44

Browse files
committed
Merge with 4 weeks of upstream commits
2 parents 8fcf649 + c7917fe commit 4bd3b44

184 files changed

Lines changed: 4633 additions & 1967 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.

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ workflows:
464464
- setup
465465
commit_sha: << pipeline.parameters.prerelease_commit_sha >>
466466
release_channel: stable
467-
dist_tag: "next,alpha"
467+
dist_tag: "next,beta"
468468
- publish_prerelease:
469469
name: Publish to Experimental channel
470470
requires:
@@ -496,7 +496,7 @@ workflows:
496496
- setup
497497
commit_sha: << pipeline.git.revision >>
498498
release_channel: stable
499-
dist_tag: "next,alpha"
499+
dist_tag: "next,beta"
500500
- publish_prerelease:
501501
name: Publish to Experimental channel
502502
requires:

.eslintrc.js

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ module.exports = {
2626

2727
parser: 'babel-eslint',
2828
parserOptions: {
29-
ecmaVersion: 8,
29+
ecmaVersion: 9,
3030
sourceType: 'script',
31-
ecmaFeatures: {
32-
experimentalObjectRestSpread: true,
33-
},
3431
},
3532

3633
// We're stricter than the default config, mostly. We'll override a few rules
@@ -113,7 +110,6 @@ module.exports = {
113110
{isProductionUserAppCode: true},
114111
],
115112
'react-internal/no-to-warn-dev-within-to-throw': ERROR,
116-
'react-internal/invariant-args': ERROR,
117113
'react-internal/warning-args': ERROR,
118114
'react-internal/no-production-logging': ERROR,
119115
'react-internal/no-cross-fork-imports': ERROR,
@@ -249,36 +245,36 @@ module.exports = {
249245
'packages/react-server-native-relay/**/*.js',
250246
],
251247
globals: {
252-
nativeFabricUIManager: true,
248+
nativeFabricUIManager: 'readonly',
253249
},
254250
},
255251
{
256252
files: ['packages/react-server-dom-webpack/**/*.js'],
257253
globals: {
258-
__webpack_chunk_load__: true,
259-
__webpack_require__: true,
254+
__webpack_chunk_load__: 'readonly',
255+
__webpack_require__: 'readonly',
260256
},
261257
},
262258
{
263259
files: ['packages/scheduler/**/*.js'],
264260
globals: {
265-
TaskController: true,
261+
TaskController: 'readonly',
266262
},
267263
},
268264
],
269265

270266
globals: {
271-
spyOnDev: true,
272-
spyOnDevAndProd: true,
273-
spyOnProd: true,
274-
__EXPERIMENTAL__: true,
275-
__EXTENSION__: true,
276-
__PROFILE__: true,
277-
__TEST__: true,
278-
__UMD__: true,
279-
__VARIANT__: true,
280-
gate: true,
281-
trustedTypes: true,
282-
IS_REACT_ACT_ENVIRONMENT: true,
267+
spyOnDev: 'readonly',
268+
spyOnDevAndProd: 'readonly',
269+
spyOnProd: 'readonly',
270+
__EXPERIMENTAL__: 'readonly',
271+
__EXTENSION__: 'readonly',
272+
__PROFILE__: 'readonly',
273+
__TEST__: 'readonly',
274+
__UMD__: 'readonly',
275+
__VARIANT__: 'readonly',
276+
gate: 'readonly',
277+
trustedTypes: 'readonly',
278+
IS_REACT_ACT_ENVIRONMENT: 'readonly',
283279
},
284280
};

ReactVersions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const ReactVersion = '18.0.0';
2222

2323
// The label used by the @next channel. Represents the upcoming release's
2424
// stability. Could be "alpha", "beta", "rc", etc.
25-
const nextChannelLabel = 'alpha';
25+
const nextChannelLabel = 'beta';
2626

2727
const stablePackages = {
2828
'create-subscription': ReactVersion,

fixtures/attribute-behavior/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/build
1111
/public/react.development.js
1212
/public/react-dom.development.js
13-
/public/react-dom-server.browser.development.js
13+
/public/react-dom-server-legacy.browser.development.js
1414

1515
# misc
1616
.DS_Store

0 commit comments

Comments
 (0)