Skip to content

Commit

Permalink
Merge with 4 weeks of upstream commits
Browse files Browse the repository at this point in the history
  • Loading branch information
josepharhar committed Dec 7, 2021
2 parents 8fcf649 + c7917fe commit 4bd3b44
Show file tree
Hide file tree
Showing 184 changed files with 4,633 additions and 1,967 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ workflows:
- setup
commit_sha: << pipeline.parameters.prerelease_commit_sha >>
release_channel: stable
dist_tag: "next,alpha"
dist_tag: "next,beta"
- publish_prerelease:
name: Publish to Experimental channel
requires:
Expand Down Expand Up @@ -496,7 +496,7 @@ workflows:
- setup
commit_sha: << pipeline.git.revision >>
release_channel: stable
dist_tag: "next,alpha"
dist_tag: "next,beta"
- publish_prerelease:
name: Publish to Experimental channel
requires:
Expand Down
38 changes: 17 additions & 21 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@ module.exports = {

parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 8,
ecmaVersion: 9,
sourceType: 'script',
ecmaFeatures: {
experimentalObjectRestSpread: true,
},
},

// We're stricter than the default config, mostly. We'll override a few rules
Expand Down Expand Up @@ -113,7 +110,6 @@ module.exports = {
{isProductionUserAppCode: true},
],
'react-internal/no-to-warn-dev-within-to-throw': ERROR,
'react-internal/invariant-args': ERROR,
'react-internal/warning-args': ERROR,
'react-internal/no-production-logging': ERROR,
'react-internal/no-cross-fork-imports': ERROR,
Expand Down Expand Up @@ -249,36 +245,36 @@ module.exports = {
'packages/react-server-native-relay/**/*.js',
],
globals: {
nativeFabricUIManager: true,
nativeFabricUIManager: 'readonly',
},
},
{
files: ['packages/react-server-dom-webpack/**/*.js'],
globals: {
__webpack_chunk_load__: true,
__webpack_require__: true,
__webpack_chunk_load__: 'readonly',
__webpack_require__: 'readonly',
},
},
{
files: ['packages/scheduler/**/*.js'],
globals: {
TaskController: true,
TaskController: 'readonly',
},
},
],

globals: {
spyOnDev: true,
spyOnDevAndProd: true,
spyOnProd: true,
__EXPERIMENTAL__: true,
__EXTENSION__: true,
__PROFILE__: true,
__TEST__: true,
__UMD__: true,
__VARIANT__: true,
gate: true,
trustedTypes: true,
IS_REACT_ACT_ENVIRONMENT: true,
spyOnDev: 'readonly',
spyOnDevAndProd: 'readonly',
spyOnProd: 'readonly',
__EXPERIMENTAL__: 'readonly',
__EXTENSION__: 'readonly',
__PROFILE__: 'readonly',
__TEST__: 'readonly',
__UMD__: 'readonly',
__VARIANT__: 'readonly',
gate: 'readonly',
trustedTypes: 'readonly',
IS_REACT_ACT_ENVIRONMENT: 'readonly',
},
};
2 changes: 1 addition & 1 deletion ReactVersions.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const ReactVersion = '18.0.0';

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

const stablePackages = {
'create-subscription': ReactVersion,
Expand Down
2 changes: 1 addition & 1 deletion fixtures/attribute-behavior/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/build
/public/react.development.js
/public/react-dom.development.js
/public/react-dom-server.browser.development.js
/public/react-dom-server-legacy.browser.development.js

# misc
.DS_Store
Expand Down
Loading

0 comments on commit 4bd3b44

Please sign in to comment.