- Changes that have landed in master but are not yet released.
+ Changes that have landed in main but are not yet released.
Click to see more.
@@ -380,7 +380,7 @@ New keys can be added to object props/state/hooks now. Existing keys can be rena
#### Improved performance
The legacy DevTools extension used to add significant performance overhead, making it unusable for some larger React applications. That overhead has been effectively eliminated in version 4.
-[Learn more](https://github.com/facebook/react/blob/master/packages/react-devtools/OVERVIEW.md) about the performance optimizations that made this possible.
+[Learn more](https://github.com/facebook/react/blob/main/packages/react-devtools/OVERVIEW.md) about the performance optimizations that made this possible.
#### Component stacks
@@ -406,7 +406,7 @@ Filter preferences are remembered between sessions.
#### No more inline props
-Components in the tree no longer show inline props. This was done to [make DevTools faster](https://github.com/facebook/react/blob/master/packages/react-devtools/OVERVIEW.md) and to make it easier to browse larger component trees.
+Components in the tree no longer show inline props. This was done to [make DevTools faster](https://github.com/facebook/react/blob/main/packages/react-devtools/OVERVIEW.md) and to make it easier to browse larger component trees.
You can view a component's props, state, and hooks by selecting it:
diff --git a/packages/react-devtools/OVERVIEW.md b/packages/react-devtools/OVERVIEW.md
index 0c8d47da26ebe..a05bafc3b2a51 100644
--- a/packages/react-devtools/OVERVIEW.md
+++ b/packages/react-devtools/OVERVIEW.md
@@ -259,7 +259,7 @@ Even when dealing with a single component, serializing deeply nested properties
Hooks present a unique challenge for the DevTools because of the concept of _custom_ hooks. (A custom hook is essentially any function that calls at least one of the built-in hooks. By convention custom hooks also have names that begin with "use".)
-So how does DevTools identify custom functions called from within third party components? It does this by temporarily overriding React's built-in hooks and shallow rendering the component in question. Whenever one of the (overridden) built-in hooks are called, it parses the call stack to spot potential custom hooks (functions between the component itself and the built-in hook). This approach enables it to build a tree structure describing all of the calls to both the built-in _and_ custom hooks, along with the values passed to those hooks. (If you're interested in learning more about this, [here is the source code](https://github.com/facebook/react/blob/master/packages/react-debug-tools/src/ReactDebugHooks.js).)
+So how does DevTools identify custom functions called from within third party components? It does this by temporarily overriding React's built-in hooks and shallow rendering the component in question. Whenever one of the (overridden) built-in hooks are called, it parses the call stack to spot potential custom hooks (functions between the component itself and the built-in hook). This approach enables it to build a tree structure describing all of the calls to both the built-in _and_ custom hooks, along with the values passed to those hooks. (If you're interested in learning more about this, [here is the source code](https://github.com/facebook/react/blob/main/packages/react-debug-tools/src/ReactDebugHooks.js).)
> **Note**: DevTools obtains hooks info by re-rendering a component.
> Breakpoints will be invoked during this additional (shallow) render,
diff --git a/packages/react-devtools/README.md b/packages/react-devtools/README.md
index 2551416b970d3..a8794737c0aff 100644
--- a/packages/react-devtools/README.md
+++ b/packages/react-devtools/README.md
@@ -105,7 +105,7 @@ Or you could develop with a local HTTP server [like `serve`](https://www.npmjs.c
**If your app is inside of CodePen**, make sure you are registered. Then press Fork (if it's not your pen), and then choose Change View > Debug. The Debug view is inspectable with DevTools because it doesn't use an iframe.
-**If your app is inside an iframe, a Chrome extension, React Native, or in another unusual environment**, try [the standalone version instead](https://github.com/facebook/react/tree/master/packages/react-devtools). Chrome apps are currently not inspectable.
+**If your app is inside an iframe, a Chrome extension, React Native, or in another unusual environment**, try [the standalone version instead](https://github.com/facebook/react/tree/main/packages/react-devtools). Chrome apps are currently not inspectable.
**If you still have issues** please [report them](https://github.com/facebook/react/issues/new?labels=Component:%20Developer%20Tools). Don't forget to specify your OS, browser version, extension version, and the exact instructions to reproduce the issue with a screenshot.
diff --git a/packages/react-reconciler/README.md b/packages/react-reconciler/README.md
index ec15ffd27436d..8b0fc1b9eae7d 100644
--- a/packages/react-reconciler/README.md
+++ b/packages/react-reconciler/README.md
@@ -51,15 +51,15 @@ const HostConfig = {
* **[Building a simple custom renderer to DOM](https://medium.com/@agent_hunt/hello-world-custom-react-renderer-9a95b7cd04bc)**
* **[Building a simple custom renderer to native](https://medium.com/@agent_hunt/introduction-to-react-native-renderers-aka-react-native-is-the-java-and-react-native-renderers-are-828a0022f433)**
-The full list of supported methods [can be found here](https://github.com/facebook/react/blob/master/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). For their signatures, we recommend looking at specific examples below.
+The full list of supported methods [can be found here](https://github.com/facebook/react/blob/main/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). For their signatures, we recommend looking at specific examples below.
The React repository includes several renderers. Each of them has its own host config.
The examples in the React repository are declared a bit differently than a third-party renderer would be. In particular, the `HostConfig` object mentioned above is never explicitly declared, and instead is a *module* in our code. However, its exports correspond directly to properties on a `HostConfig` object you'd need to declare in your code:
-* [React ART](https://github.com/facebook/react/blob/master/packages/react-art/src/ReactART.js) and its [host config](https://github.com/facebook/react/blob/master/packages/react-art/src/ReactARTHostConfig.js)
-* [React DOM](https://github.com/facebook/react/blob/master/packages/react-dom/src/client/ReactDOM.js) and its [host config](https://github.com/facebook/react/blob/master/packages/react-dom/src/client/ReactDOMHostConfig.js)
-* [React Native](https://github.com/facebook/react/blob/master/packages/react-native-renderer/src/ReactNativeRenderer.js) and its [host config](https://github.com/facebook/react/blob/master/packages/react-native-renderer/src/ReactNativeHostConfig.js)
+* [React ART](https://github.com/facebook/react/blob/main/packages/react-art/src/ReactART.js) and its [host config](https://github.com/facebook/react/blob/main/packages/react-art/src/ReactARTHostConfig.js)
+* [React DOM](https://github.com/facebook/react/blob/main/packages/react-dom/src/client/ReactDOM.js) and its [host config](https://github.com/facebook/react/blob/main/packages/react-dom/src/client/ReactDOMHostConfig.js)
+* [React Native](https://github.com/facebook/react/blob/main/packages/react-native-renderer/src/ReactNativeRenderer.js) and its [host config](https://github.com/facebook/react/blob/main/packages/react-native-renderer/src/ReactNativeHostConfig.js)
If these links break please file an issue and we’ll fix them. They intentionally link to the latest versions since the API is still evolving. If you have more questions please file an issue and we’ll try to help!
@@ -332,10 +332,10 @@ This method should mutate the `container` root node and remove all children from
### Persistence Methods
-If you use the persistent mode instead of the mutation mode, you would still need the "Core Methods". However, instead of the Mutation Methods above you will implement a different set of methods that performs cloning nodes and replacing them at the root level. You can find a list of them in the "Persistence" section [listed in this file](https://github.com/facebook/react/blob/master/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). File an issue if you need help.
+If you use the persistent mode instead of the mutation mode, you would still need the "Core Methods". However, instead of the Mutation Methods above you will implement a different set of methods that performs cloning nodes and replacing them at the root level. You can find a list of them in the "Persistence" section [listed in this file](https://github.com/facebook/react/blob/main/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). File an issue if you need help.
### Hydration Methods
You can optionally implement hydration to "attach" to the existing tree during the initial render instead of creating it from scratch. For example, the DOM renderer uses this to attach to an HTML markup.
-To support hydration, you need to declare `supportsHydration: true` and then implement the methods in the "Hydration" section [listed in this file](https://github.com/facebook/react/blob/master/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). File an issue if you need help.
+To support hydration, you need to declare `supportsHydration: true` and then implement the methods in the "Hydration" section [listed in this file](https://github.com/facebook/react/blob/main/packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js). File an issue if you need help.
diff --git a/packages/react/index.js b/packages/react/index.js
index 247d17ec01b8d..890b06084738a 100644
--- a/packages/react/index.js
+++ b/packages/react/index.js
@@ -7,7 +7,7 @@
* @flow
*/
-// Keep in sync with https://github.com/facebook/flow/blob/master/lib/react.js
+// Keep in sync with https://github.com/facebook/flow/blob/main/lib/react.js
export type StatelessFunctionalComponent<
P,
> = React$StatelessFunctionalComponent;
diff --git a/packages/use-subscription/README.md b/packages/use-subscription/README.md
index 549230211ca84..4ea34e1bca8b4 100644
--- a/packages/use-subscription/README.md
+++ b/packages/use-subscription/README.md
@@ -8,7 +8,7 @@ This utility can be used for subscriptions to a single value that are typically
Most other cases have **better long-term solutions**:
* Redux/Flux stores should use the [context API](https://reactjs.org/docs/context.html) instead.
-* I/O subscriptions (e.g. notifications) that update infrequently should use a mechanism like [`react-cache`](https://github.com/facebook/react/blob/master/packages/react-cache/README.md) instead.
+* I/O subscriptions (e.g. notifications) that update infrequently should use a mechanism like [`react-cache`](https://github.com/facebook/react/blob/main/packages/react-cache/README.md) instead.
* Complex libraries like Relay/Apollo should manage subscriptions manually with the same techniques which this library uses under the hood (as referenced [here](https://gist.github.com/bvaughn/d569177d70b50b58bff69c3c4a5353f3)) in a way that is most optimized for their library usage.
## Limitations in concurrent mode
diff --git a/scripts/bench/README.md b/scripts/bench/README.md
index 2d1ea7bea3f18..ae567fa5169dc 100644
--- a/scripts/bench/README.md
+++ b/scripts/bench/README.md
@@ -27,8 +27,8 @@ yarn start --local
# will only build and run remote merge base repo against benchmarks (no local values will be shown)
yarn start --remote
-# will only build and run remote master repo against benchmarks
-yarn start --remote=master
+# will only build and run remote main repo against benchmarks
+yarn start --remote=main
# same as "yarn start"
yarn start --remote --local
diff --git a/scripts/bench/build.js b/scripts/bench/build.js
index 3ef0ffe18673a..9147d8519e524 100644
--- a/scripts/bench/build.js
+++ b/scripts/bench/build.js
@@ -55,7 +55,7 @@ async function getMergeBaseFromLocalGitRepo(localRepo) {
return await Git.Merge.base(
repo,
await repo.getHeadCommit(),
- await repo.getBranchCommit('master')
+ await repo.getBranchCommit('main')
);
}
@@ -82,15 +82,15 @@ async function buildBenchmarkBundlesFromGitRepo(
// if not, clone the repo to remote-repo folder
repo = await Git.Clone(url, remoteRepoDir);
}
- let commit = await repo.getBranchCommit('master');
+ let commit = await repo.getBranchCommit('main');
// reset hard to this remote head
await Git.Reset.reset(repo, commit, Git.Reset.TYPE.HARD);
- // then we checkout the latest master head
- await repo.checkoutBranch('master');
+ // then we checkout the latest main head
+ await repo.checkoutBranch('main');
// make sure we pull in the latest changes
- await repo.mergeBranches('master', 'origin/master');
+ await repo.mergeBranches('main', 'origin/main');
// then we check if we need to move the HEAD to the merge base
- if (commitId && commitId !== 'master') {
+ if (commitId && commitId !== 'main') {
// as the commitId probably came from our local repo
// we use it to lookup the right commit in our remote repo
commit = await Git.Commit.lookup(repo, commitId);
diff --git a/scripts/bench/runner.js b/scripts/bench/runner.js
index ce4e411063c81..922e914d4ea2d 100644
--- a/scripts/bench/runner.js
+++ b/scripts/bench/runner.js
@@ -61,7 +61,7 @@ async function runBenchmarks(reactPath) {
}
// get the performance benchmark results
-// from remote master (default React repo)
+// from remote main (default React repo)
async function benchmarkRemoteMaster() {
console.log(chalk.gray(`- Building React bundles...`));
let commit = argv.remote;
diff --git a/scripts/error-codes/README.md b/scripts/error-codes/README.md
index 7d0988660f534..9933e9903d1ea 100644
--- a/scripts/error-codes/README.md
+++ b/scripts/error-codes/README.md
@@ -2,14 +2,14 @@ The error code system substitutes React's error messages with error IDs to
provide a better debugging support in production. Check out the blog post
[here](https://reactjs.org/blog/2016/07/11/introducing-reacts-error-code-system.html).
-- [`codes.json`](https://github.com/facebook/react/blob/master/scripts/error-codes/codes.json)
+- [`codes.json`](https://github.com/facebook/react/blob/main/scripts/error-codes/codes.json)
contains the mapping from IDs to error messages. This file is generated by the
Gulp plugin and is used by both the Babel plugin and the error decoder page in
our documentation. This file is append-only, which means an existing code in
the file will never be changed/removed.
-- [`extract-errors.js`](https://github.com/facebook/react/blob/master/scripts/error-codes/extract-errors.js)
+- [`extract-errors.js`](https://github.com/facebook/react/blob/main/scripts/error-codes/extract-errors.js)
is an node script that traverses our codebase and updates `codes.json`. You
can test it by running `yarn extract-errors`.
-- [`transform-error-messages`](https://github.com/facebook/react/blob/master/scripts/error-codes/transform-error-messages.js)
+- [`transform-error-messages`](https://github.com/facebook/react/blob/main/scripts/error-codes/transform-error-messages.js)
is a Babel pass that rewrites error messages to IDs for a production
(minified) build.
diff --git a/scripts/error-codes/extract-errors.js b/scripts/error-codes/extract-errors.js
index 58823cbe16873..4541a3eeeab6c 100644
--- a/scripts/error-codes/extract-errors.js
+++ b/scripts/error-codes/extract-errors.js
@@ -18,7 +18,7 @@ const babylonOptions = {
// As a parser, babylon has its own options and we can't directly
// import/require a babel preset. It should be kept **the same** as
// the `babel-plugin-syntax-*` ones specified in
- // https://github.com/facebook/fbjs/blob/master/packages/babel-preset-fbjs/configure.js
+ // https://github.com/facebook/fbjs/blob/main/packages/babel-preset-fbjs/configure.js
plugins: [
'classProperties',
'flow',
diff --git a/scripts/merge-fork/README.md b/scripts/merge-fork/README.md
index 75208a5781a12..2b01bfe156bdd 100644
--- a/scripts/merge-fork/README.md
+++ b/scripts/merge-fork/README.md
@@ -51,7 +51,7 @@ By default, the changes are compared to HEAD. You can use `--base-ref` to compar
```sh
yarn merge-fork \
- --base-ref=$(git merge-base HEAD origin/master)
+ --base-ref=$(git merge-base HEAD origin/main)
--base-dir=packages/react-reconciler/src \
ReactFiberWorkLoop
```
diff --git a/scripts/print-warnings/print-warnings.js b/scripts/print-warnings/print-warnings.js
index 9bdd6543d2a3d..95dabcc1e11e0 100644
--- a/scripts/print-warnings/print-warnings.js
+++ b/scripts/print-warnings/print-warnings.js
@@ -19,7 +19,7 @@ const parserOptions = {
// babelParser has its own options and we can't directly
// import/require a babel preset. It should be kept **the same** as
// the `babel-plugin-syntax-*` ones specified in
- // https://github.com/facebook/fbjs/blob/master/packages/babel-preset-fbjs/configure.js
+ // https://github.com/facebook/fbjs/blob/main/packages/babel-preset-fbjs/configure.js
plugins: [
'classProperties',
'flow',
diff --git a/scripts/release/README.md b/scripts/release/README.md
index 979062dd1484d..1737c3cf18800 100644
--- a/scripts/release/README.md
+++ b/scripts/release/README.md
@@ -50,7 +50,7 @@ The sections below include meaningful `--tags` in the instructions. However, kee
"Next" builds are meant to be lightweight and published often. In most cases, they can be published using artifacts built by Circle CI.
To prepare a build for a particular commit:
-1. Choose a commit from [the commit log](https://github.com/facebook/react/commits/master).
+1. Choose a commit from [the commit log](https://github.com/facebook/react/commits/main).
2. Copy the SHA (by clicking the 📋 button)
5. Run the [`prepare-release-from-ci`](#prepare-release-from-ci) script with the SHA 1 you found:
```sh
@@ -115,7 +115,7 @@ Begin by creating a branch from the previous git tag1:
git checkout -b 16.8.3 v16.8.2
```
-Next cherry pick any changes from master that you want to include in the release:
+Next cherry pick any changes from main that you want to include in the release:
```sh
git cherry-pick
diff --git a/scripts/release/prepare-release-from-ci.js b/scripts/release/prepare-release-from-ci.js
index c61b3ed6372ed..80dd051930785 100755
--- a/scripts/release/prepare-release-from-ci.js
+++ b/scripts/release/prepare-release-from-ci.js
@@ -12,7 +12,7 @@ const testPackagingFixture = require('./shared-commands/test-packaging-fixture')
const run = async () => {
try {
- addDefaultParamValue(null, '--commit', 'master');
+ addDefaultParamValue(null, '--commit', 'main');
const params = await parseParams();
params.cwd = join(__dirname, '..', '..');
diff --git a/scripts/release/prepare-release-from-npm-commands/guess-stable-version-numbers.js b/scripts/release/prepare-release-from-npm-commands/guess-stable-version-numbers.js
index 1e9b560faf08c..a3cde5d1c4fce 100644
--- a/scripts/release/prepare-release-from-npm-commands/guess-stable-version-numbers.js
+++ b/scripts/release/prepare-release-from-npm-commands/guess-stable-version-numbers.js
@@ -25,9 +25,9 @@ const run = async ({cwd, packages, skipPackages}, versionsMap) => {
// Guess the next version by incrementing patch.
// The script will confirm this later.
- // By default, new releases from masters should increment the minor version number,
+ // By default, new releases from mains should increment the minor version number,
// and patch releases should be done from branches.
- if (branch === 'master') {
+ if (branch === 'main') {
versionsMap.set(packageName, `${major}.${minor + 1}.0`);
} else {
versionsMap.set(packageName, `${major}.${minor}.${patch + 1}`);
diff --git a/scripts/release/publish-using-ci-workflow.js b/scripts/release/publish-using-ci-workflow.js
index 0bb6c7d0d6c25..48a834ba1f19f 100644
--- a/scripts/release/publish-using-ci-workflow.js
+++ b/scripts/release/publish-using-ci-workflow.js
@@ -78,7 +78,7 @@ async function pollUntilWorkflowFinishes(workflowID) {
async function main() {
const headCommitResponse = await fetch(
- 'https://api.github.com/repos/facebook/react/commits/master'
+ 'https://api.github.com/repos/facebook/react/commits/main'
);
const headCommitJSON = await headCommitResponse.json();
const headCommitSha = headCommitJSON.sha;
diff --git a/scripts/shared/listChangedFiles.js b/scripts/shared/listChangedFiles.js
index e9b586aa94f34..9db4e15071383 100644
--- a/scripts/shared/listChangedFiles.js
+++ b/scripts/shared/listChangedFiles.js
@@ -26,7 +26,7 @@ const execGitCmd = args =>
.split('\n');
const listChangedFiles = () => {
- const mergeBase = execGitCmd(['merge-base', 'HEAD', 'master']);
+ const mergeBase = execGitCmd(['merge-base', 'HEAD', 'main']);
return new Set([
...execGitCmd(['diff', '--name-only', '--diff-filter=ACMRTUB', mergeBase]),
...execGitCmd(['ls-files', '--others', '--exclude-standard']),