Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some remaining instances of master to main #21982

Merged
merged 4 commits into from
Jul 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fixtures/attribute-behavior/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ Right now, we use a purple outline to call out cases where the assigned property

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

You can find the guide for how to do things in a CRA [here](https://github.com/facebook/create-react-app/blob/master/packages/cra-template/template/README.md).
You can find the guide for how to do things in a CRA [here](https://github.com/facebook/create-react-app/blob/main/packages/cra-template/template/README.md).
2 changes: 1 addition & 1 deletion fixtures/concurrent/time-slicing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ It depends on a local build of React and enables us to easily test async "time s

No. The APIs being tested here are unstable and some of them have still not been released to NPM. For now, this fixture is only a test harness.

There are also known bugs and inefficiencies in master so **don't use this fixture for demonstration purposes either yet**. Until they are fixed, this fixture is **not** indicative of React async rendering performance.
There are also known bugs and inefficiencies in main so **don't use this fixture for demonstration purposes either yet**. Until they are fixed, this fixture is **not** indicative of React async rendering performance.

## How do I run this fixture?

Expand Down
2 changes: 1 addition & 1 deletion fixtures/devtools/regression/shared.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (typeof SchedulerTracing !== 'undefined') {
trace = (_, __, callback) => callback();
}

// https://github.com/facebook/react/blob/master/CHANGELOG.md
// https://github.com/facebook/react/blob/main/CHANGELOG.md
switch (major) {
case 16:
switch (minor) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// flow-typed version: 9c71eca8ef/react-test-renderer_v16.x.x/flow_>=v0.47.x

// Type definitions for react-test-renderer 16.x.x
// Ported from: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/main/types/react-test-renderer
// Ported from: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-test-renderer

'use strict';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ describe('ProfilingCache', () => {

const About = () => <div>About</div>;

// Mimics https://github.com/ReactTraining/react-router/blob/main/packages/react-router/modules/Router.js
// Mimics https://github.com/ReactTraining/react-router/blob/master/packages/react-router/modules/Router.js
function Router({children}) {
const [path, setPath] = React.useState('/');
return (
Expand All @@ -682,7 +682,7 @@ describe('ProfilingCache', () => {
);
}

// Mimics https://github.com/ReactTraining/react-router/blob/main/packages/react-router/modules/Switch.js
// Mimics https://github.com/ReactTraining/react-router/blob/master/packages/react-router/modules/Switch.js
function Switch({children}) {
return (
<RouterContext.Consumer>
Expand All @@ -699,14 +699,14 @@ describe('ProfilingCache', () => {
);
}

// Mimics https://github.com/ReactTraining/react-router/blob/main/packages/react-router/modules/Route.js
// Mimics https://github.com/ReactTraining/react-router/blob/master/packages/react-router/modules/Route.js
function Route({children, path}) {
return null;
}

const linkRef = React.createRef();

// Mimics https://github.com/ReactTraining/react-router/blob/main/packages/react-router-dom/modules/Link.js
// Mimics https://github.com/ReactTraining/react-router/blob/master/packages/react-router-dom/modules/Link.js
function Link({children, path}) {
return (
<RouterContext.Consumer>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-devtools/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
* Console patching should handle Symbols without erroring ([bvaughn](https://github.com/bvaughn) in [#21368](https://github.com/facebook/react/pull/21368))

###### Bridge protocol version backend/frontend
During initialization, DevTools now checks to ensure it's compatible with the ["backend"](https://github.com/facebook/react/blob/master/packages/react-devtools/OVERVIEW.md#overview) that's embedded within a renderer like React Native. If the two aren't compatible, upgrade instructions will be shown:
During initialization, DevTools now checks to ensure it's compatible with the ["backend"](https://github.com/facebook/react/blob/main/packages/react-devtools/OVERVIEW.md#overview) that's embedded within a renderer like React Native. If the two aren't compatible, upgrade instructions will be shown:

<img width="400" height="233" alt="Dialog displaying downgrade instructions for the React DevTools frontend to connect to an older backend version" src="https://user-images.githubusercontent.com/29597/115997927-f77f2a00-a5b2-11eb-9098-20042b664cea.png">

Expand Down
2 changes: 1 addition & 1 deletion scripts/error-codes/extract-errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/main/packages/babel-preset-fbjs/configure.js
// https://github.com/facebook/fbjs/blob/master/packages/babel-preset-fbjs/configure.js
plugins: [
'classProperties',
'flow',
Expand Down