Skip to content

Commit d483463

Browse files
author
Brian Vaughn
authored
Updated scripts and config to replace "master" with "main" branch (#21768)
1 parent cae6350 commit d483463

File tree

34 files changed

+65
-65
lines changed

34 files changed

+65
-65
lines changed

.circleci/config.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ jobs:
171171
- run:
172172
name: Download artifacts for base revision
173173
command: |
174-
git fetch origin master
174+
git fetch origin main
175175
cd ./scripts/release && yarn && cd ../../
176-
scripts/release/download-experimental-build.js --commit=$(git merge-base HEAD origin/master)
176+
scripts/release/download-experimental-build.js --commit=$(git merge-base HEAD origin/main)
177177
mv ./build2 ./base-build
178178
- persist_to_workspace:
179179
root: .
@@ -356,7 +356,7 @@ jobs:
356356
- run:
357357
name: Run publish script
358358
command: |
359-
git fetch origin master
359+
git fetch origin main
360360
cd ./scripts/release && yarn && cd ../../
361361
scripts/release/prepare-release-from-ci.js --skipTests -r << parameters.release_channel >> --commit=<< parameters.commit_sha >>
362362
cp ./scripts/release/ci-npmrc ~/.npmrc
@@ -414,7 +414,7 @@ workflows:
414414
filters:
415415
branches:
416416
only:
417-
- master
417+
- main
418418

419419
# New workflow that will replace "stable" and "experimental"
420420
build_and_test:
@@ -491,14 +491,14 @@ workflows:
491491
filters:
492492
branches:
493493
ignore:
494-
- master
494+
- main
495495
requires:
496496
- setup
497497
- sizebot:
498498
filters:
499499
branches:
500500
ignore:
501-
- master
501+
- main
502502
requires:
503503
- get_base_build
504504
- yarn_build_combined
@@ -514,7 +514,7 @@ workflows:
514514
filters:
515515
branches:
516516
only:
517-
- master
517+
- main
518518
jobs:
519519
- setup
520520
- test_fuzz:
@@ -555,7 +555,7 @@ workflows:
555555
filters:
556556
branches:
557557
only:
558-
- master
558+
- main
559559
jobs:
560560
- setup
561561
- publish_prerelease:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
Before submitting a pull request, please make sure the following is done:
66
7-
1. Fork [the repository](https://github.com/facebook/react) and create your branch from `master`.
7+
1. Fork [the repository](https://github.com/facebook/react) and create your branch from `main`.
88
2. Run `yarn` in the repository root.
99
3. If you've fixed a bug or added code that should be tested, add tests!
1010
4. Ensure the test suite passes (`yarn test`). Tip: `yarn test --watch TestName` is helpful in development.

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ This release was published in a broken state and should be skipped.
679679

680680
### React Is (New)
681681

682-
* First release of the [new package](https://github.com/facebook/react/tree/master/packages/react-is) that libraries can use to detect different React node types. ([@bvaughn](https://github.com/bvaughn) in [#12199](https://github.com/facebook/react/pull/12199))
682+
* First release of the [new package](https://github.com/facebook/react/tree/main/packages/react-is) that libraries can use to detect different React node types. ([@bvaughn](https://github.com/bvaughn) in [#12199](https://github.com/facebook/react/pull/12199))
683683
* Add `ReactIs.isValidElementType()` to help higher-order components validate their inputs. ([@jamesreggio](https://github.com/jamesreggio) in [#12483](https://github.com/facebook/react/pull/12483))
684684

685685
### React Lifecycles Compat (New)
@@ -688,7 +688,7 @@ This release was published in a broken state and should be skipped.
688688

689689
### Create Subscription (New)
690690

691-
* First release of the [new package](https://github.com/facebook/react/tree/master/packages/create-subscription) to subscribe to external data sources safely for async rendering. ([@bvaughn](https://github.com/bvaughn) in [#12325](https://github.com/facebook/react/pull/12325))
691+
* First release of the [new package](https://github.com/facebook/react/tree/main/packages/create-subscription) to subscribe to external data sources safely for async rendering. ([@bvaughn](https://github.com/bvaughn) in [#12325](https://github.com/facebook/react/pull/12325))
692692

693693
### React Reconciler (Experimental)
694694

@@ -819,12 +819,12 @@ Starting with 16.1.0, we will no longer be publishing new releases on Bower. You
819819

820820
### React Reconciler (Experimental)
821821

822-
* First release of the [new experimental package](https://github.com/facebook/react/blob/master/packages/react-reconciler/README.md) for creating custom renderers. ([@iamdustan](https://github.com/iamdustan) in [#10758](https://github.com/facebook/react/pull/10758))
822+
* First release of the [new experimental package](https://github.com/facebook/react/blob/main/packages/react-reconciler/README.md) for creating custom renderers. ([@iamdustan](https://github.com/iamdustan) in [#10758](https://github.com/facebook/react/pull/10758))
823823
* Add support for React DevTools. ([@gaearon](https://github.com/gaearon) in [#11463](https://github.com/facebook/react/pull/11463))
824824

825825
### React Call Return (Experimental)
826826

827-
* First release of the [new experimental package](https://github.com/facebook/react/tree/master/packages/react-call-return) for parent-child communication. ([@gaearon](https://github.com/gaearon) in [#11364](https://github.com/facebook/react/pull/11364))
827+
* First release of the [new experimental package](https://github.com/facebook/react/tree/main/packages/react-call-return) for parent-child communication. ([@gaearon](https://github.com/gaearon) in [#11364](https://github.com/facebook/react/pull/11364))
828828

829829
## 16.0.1 (August 1, 2018)
830830

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [React](https://reactjs.org/) &middot; [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/facebook/react/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/react.svg?style=flat)](https://www.npmjs.com/package/react) [![CircleCI Status](https://circleci.com/gh/facebook/react.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/facebook/react) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://reactjs.org/docs/how-to-contribute.html#your-first-pull-request)
1+
# [React](https://reactjs.org/) &middot; [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/facebook/react/blob/main/LICENSE) [![npm version](https://img.shields.io/npm/v/react.svg?style=flat)](https://www.npmjs.com/package/react) [![CircleCI Status](https://circleci.com/gh/facebook/react.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/facebook/react) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://reactjs.org/docs/how-to-contribute.html#your-first-pull-request)
22

33
React is a JavaScript library for building user interfaces.
44

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ platform:
1818

1919
branches:
2020
only:
21-
- master
21+
- main
2222

2323
# Disable Visual Studio build and deploy
2424
build: off

packages/create-subscription/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This utility should be used for subscriptions to a single value that are typical
88

99
Other cases have **better long-term solutions**:
1010
* Redux/Flux stores should use the [context API](https://reactjs.org/docs/context.html) instead.
11-
* I/O subscriptions (e.g. notifications) that update infrequently should use [`react-cache`](https://github.com/facebook/react/blob/master/packages/react-cache/README.md) instead.
11+
* I/O subscriptions (e.g. notifications) that update infrequently should use [`react-cache`](https://github.com/facebook/react/blob/main/packages/react-cache/README.md) instead.
1212
* 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.
1313

1414
## Limitations in async mode

packages/eslint-plugin-react-hooks/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@
7171

7272
## 1.x
7373

74-
The 1.x releases aren’t noted in this changelog, but you can find them in the [commit history](https://github.com/facebook/react/commits/master/packages/eslint-plugin-react-hooks).
74+
The 1.x releases aren’t noted in this changelog, but you can find them in the [commit history](https://github.com/facebook/react/commits/main/packages/eslint-plugin-react-hooks).

packages/react-devtools-extensions/flow-typed/npm/react-test-renderer_v16.x.x.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// flow-typed version: 9c71eca8ef/react-test-renderer_v16.x.x/flow_>=v0.47.x
33

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

77
'use strict';
88

packages/react-devtools-extensions/popups/disabled.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
<p>
1414
<b>This page doesn&rsquo;t appear to be using React.</b>
1515
<br />
16-
If this seems wrong, follow the <a href="https://github.com/facebook/react/tree/master/packages/react-devtools#the-react-tab-doesnt-show-up">troubleshooting instructions</a>.
16+
If this seems wrong, follow the <a href="https://github.com/facebook/react/tree/main/packages/react-devtools#the-react-tab-doesnt-show-up">troubleshooting instructions</a>.
1717
</p>

packages/react-devtools-inline/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,4 +211,4 @@ Once the above packages have been built or downloaded, you can watch for changes
211211
yarn start
212212
```
213213

214-
To test package changes, refer to the [`react-devtools-shell` README](https://github.com/facebook/react/blob/master/packages/react-devtools-shell/README.md).
214+
To test package changes, refer to the [`react-devtools-shell` README](https://github.com/facebook/react/blob/main/packages/react-devtools-shell/README.md).

0 commit comments

Comments
 (0)