build: cleanup remaining references to master branch (#24866)

We should clean up all references to `master` and use `main`
where possible.

Author: devversion

.circleci/config.yml

@@ -84,8 +84,6 @@ var_14: &publish_branches_filter
   branches:
     only:
       - main
-      # TODO(BRANCH_RENAME_CLEANUP): remove
-      - master
       # 6.0.x, 7.1.x, etc.
       - /\d+\.\d+\.x/
 
@@ -137,8 +135,6 @@ var_21: &only_main_branch_filter
   branches:
     only:
       - main
-        # TODO(BRANCH_RENAME_CLEANUP): remove
-      - master
 
 # -----------------------------
 # Container version of CircleCI
@@ -677,5 +673,3 @@ workflows:
                 # it's not guaranteed that older versions of Angular Material always work
                 # with the latest Angular version.
                 - main
-                # TODO(BRANCH_RENAME_CLEANUP): remove
-                - master

.circleci/rebase-pr.js

@@ -114,14 +114,6 @@ function getRefFromBranchList(gitOutput) {
       return 1;
     }
 
-    // TODO(BRANCH_RENAME_CLEANUP): remove
-    if (a === 'master') {
-      return -1;
-    }
-    if (b === 'master') {
-      return 1;
-    }
-
     const aIsSemver = semverRegex.test(a);
     const bIsSemver = semverRegex.test(b);
     if (aIsSemver && bIsSemver) {

.github/angular-robot.yml

@@ -41,7 +41,7 @@ merge:
     noConflict: true
     # whether the PR should have all reviews completed.
     requireReviews: false
-    # list of labels that a PR needs to have, checked with a regexp (e.g. "PR target:" will work for the label "PR target: master")
+    # list of labels that a PR needs to have, checked with a regexp.
     requiredLabels:
       - 'target: *'
 
@@ -64,7 +64,7 @@ merge:
   # the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
   # {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option
   # {{PLACEHOLDER}} will be replaced by the list of failing checks
-  mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:\n{{PLACEHOLDER}}\n\n**If you want your PR to be merged, it has to pass all the CI checks.**\n\nIf you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help."
+  mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:\n{{PLACEHOLDER}}\n\n**If you want your PR to be merged, it has to pass all the CI checks.**\n\nIf you can't get the PR to a green state due to flakes or broken `main`, please try rebasing to `main` and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help."
 
 # options for the triage plugin
 triage:

.github/workflows/scorecard.yml

@@ -4,11 +4,7 @@ on:
   schedule:
     - cron: '0 3 * * 0'
   push:
-    branches: [
-        main,
-        # TODO(BRANCH_RENAME_CLEANUP): remove
-        master,
-      ]
+    branches: [main]
   workflow_dispatch:
 
 # Declare default permissions as read only.

CHANGELOG.md

@@ -2360,7 +2360,7 @@ Sass theming API has been reworked so that clients can take advantage of `@use`.
 * Renamed functions, mixins, and variables to be a better reflection of what they do
 * Applications still using `node-sass` will need to switch to the `sass` package
 
-For more information, check out the [new theming guide](https://github.com/angular/components/blob/master/guides/theming.md).
+For more information, check out the [new theming guide](https://github.com/angular/components/blob/main/guides/theming.md).
 
 ### cdk
 
@@ -4031,7 +4031,7 @@ the new Sass module system, which offers a number of benefits over the existing
 | bug fix |  **autocomplete:** provide horizontal fallback positions ([#18906](https://github.com/angular/components/issues/18906)) ([3488dda](https://github.com/angular/components/commit/3488dda)), closes [#18854](https://github.com/angular/components/issues/18854) |
 | bug fix |  **bottom-sheet:** allow result to be passed when dismissing through service ([#18831](https://github.com/angular/components/issues/18831)) ([48e26b1](https://github.com/angular/components/commit/48e26b1)) |
 | bug fix |  **core:** ripple mutating global options when animations are… ([#18983](https://github.com/angular/components/issues/18983)) ([09f2872](https://github.com/angular/components/commit/09f2872)) |
-| bug fix |  **datepicker:** add hover indication to navigation buttons ([#18995](https://github.com/angular/components/issues/18995)) ([94ab707](https://github.com/angular/components/commit/94ab707)), closes [/github.com/angular/components/blob/master/src/material/button/button.scss#L13](https://github.com//github.com/angular/components/blob/master/src/material/button/button.scss/issues/L13) [#18958](https://github.com/angular/components/issues/18958) |
+| bug fix |  **datepicker:** add hover indication to navigation buttons ([#18995](https://github.com/angular/components/issues/18995)) ([94ab707](https://github.com/angular/components/commit/94ab707)), closes [/github.com/angular/components/blob/main/src/material/button/button.scss#L13](https://github.com//github.com/angular/components/blob/main/src/material/button/button.scss/issues/L13) [#18958](https://github.com/angular/components/issues/18958) |
 | bug fix |  **datepicker:** disable calendar hover styles on touch devices ([#18876](https://github.com/angular/components/issues/18876)) ([d752cdf](https://github.com/angular/components/commit/d752cdf)) |
 | bug fix |  **datepicker:** error in IE/Edge for static disabled binding ([#18202](https://github.com/angular/components/issues/18202)) ([80977f6](https://github.com/angular/components/commit/80977f6)) |
 | bug fix |  **dialog:** recapture focus when clicking on backdrop when cl… ([#18826](https://github.com/angular/components/issues/18826)) ([c5ddfe8](https://github.com/angular/components/commit/c5ddfe8)), closes [#18799](https://github.com/angular/components/issues/18799) |
@@ -4418,7 +4418,7 @@ features in that regard- a new package that wraps the
 in an easy-to-use Angular component.
 
 You can see the
-[documentation on GitHub](https://github.com/angular/components/blob/master/src/google-maps/README.md)
+[documentation on GitHub](https://github.com/angular/components/blob/main/src/google-maps/README.md)
 for the time being.
 
 Big thanks to @mbehrlich for contributing this!
@@ -4836,7 +4836,7 @@ features in that regard- a new package that wraps the
 in an easy-to-use Angular component.
 
 You can see the
-[documentation on GitHub](https://github.com/angular/components/blob/master/src/youtube-player)
+[documentation on GitHub](https://github.com/angular/components/blob/main/src/youtube-player)
 for the time being.
 
 Big thanks to @YourDeveloperFriend for contributing this!
@@ -6287,4 +6287,4 @@ You can view a beta version of the docs at https://beta-angular-material-io.fire
 
 # Changes Prior to 7.0.0
 
-To view changes that occurred prior to 7.0.0, see [CHANGELOG_ARCHIVE.md](https://github.com/angular/components/blob/master/CHANGELOG_ARCHIVE.md).
+To view changes that occurred prior to 7.0.0, see [CHANGELOG_ARCHIVE.md](https://github.com/angular/components/blob/main/CHANGELOG_ARCHIVE.md).

CHANGELOG_ARCHIVE.md

@@ -1,4 +1,4 @@
-This contains changes before 7.0.0. See [CHANGELOG.md](https://github.com/angular/components/blob/master/CHANGELOG.md) for changes in 7.0.0+.
+This contains changes before 7.0.0. See [CHANGELOG.md](https://github.com/angular/components/blob/main/CHANGELOG.md) for changes in 7.0.0+.
 
 <a name="6.4.7"></a>
 ## [6.4.7 kryptonite-kombucha](https://github.com/angular/material2/compare/6.4.6...6.4.7) (2018-08-29)
@@ -588,7 +588,7 @@ ng update @angular/material
 
 
 ### Breaking Changes
-* A number of APIs that were deprecated during beta have been removed, see [here for complete list](https://github.com/angular/material2/blob/master/CHANGELOG.md#600-beta5-2018-03-23)
+* A number of APIs that were deprecated during beta have been removed, see [here for complete list](https://github.com/angular/material2/blob/main/CHANGELOG.md#600-beta5-2018-03-23)
 * See `ng update` tooling above to automatically migrate to the new APIs
 
 
@@ -1640,7 +1640,7 @@ We expect to have the tool ready when we release version 6.0.0.
 * **menu:** not closing when overlay is detached externally ([#8868](https://github.com/angular/material2/issues/8868)) ([534c797](https://github.com/angular/material2/commit/534c797))
 * **overlay:** export OverlaySizeConfig ([#8932](https://github.com/angular/material2/issues/8932)) ([adfa31e](https://github.com/angular/material2/commit/adfa31e))
 * **paginator:** set default display value ([#8455](https://github.com/angular/material2/issues/8455)) ([ccb325e](https://github.com/angular/material2/commit/ccb325e)), closes [#8454](https://github.com/angular/material2/issues/8454)
-* **portal:** inaccurate hasAttahed result and portal being cleared if attached too early ([#8642](https://github.com/angular/material2/issues/8642)) ([93e6c53](https://github.com/angular/material2/commit/93e6c53)), closes [/github.com/angular/material2/blob/master/src/material/dialog/dialog-container.ts#L118](https://github.com//github.com/angular/material2/blob/master/src/material/dialog/dialog-container.ts/issues/L118) [#8628](https://github.com/angular/material2/issues/8628)
+* **portal:** inaccurate hasAttahed result and portal being cleared if attached too early ([#8642](https://github.com/angular/material2/issues/8642)) ([93e6c53](https://github.com/angular/material2/commit/93e6c53)), closes [/github.com/angular/material2/blob/main/src/material/dialog/dialog-container.ts#L118](https://github.com//github.com/angular/material2/blob/main/src/material/dialog/dialog-container.ts/issues/L118) [#8628](https://github.com/angular/material2/issues/8628)
 * **select:** alt + arrow key not opening in single-selection mode ([#8910](https://github.com/angular/material2/issues/8910)) ([85f83f9](https://github.com/angular/material2/commit/85f83f9))
 * **select:** change event emitted before data binding is updated ([#8740](https://github.com/angular/material2/issues/8740)) ([2493797](https://github.com/angular/material2/commit/2493797)), closes [#8739](https://github.com/angular/material2/issues/8739)
 * **select:** complete state change event ([#8777](https://github.com/angular/material2/issues/8777)) ([46411e3](https://github.com/angular/material2/commit/46411e3))
@@ -2023,15 +2023,15 @@ StackBlitz instead of Plunker.
 ### Breaking Changes
 
 * All "md" prefixes have been removed. See the [deprecation notice in the beta.11 notes for more
-information](https://github.com/angular/material2/blob/master/CHANGELOG.md#deprecation-of-md-prefix).
+information](https://github.com/angular/material2/blob/main/CHANGELOG.md#deprecation-of-md-prefix).
 * All cdk re-exports in `@angular/material` have been removed. See the [the beta.10 notes for more
-information](https://github.com/angular/material2/blob/master/CHANGELOG.md#breaking-changes-2).
+information](https://github.com/angular/material2/blob/main/CHANGELOG.md#breaking-changes-2).
 * Previously the `ScrollDispatcher.scrolled` subscription would react both on scroll events and on window resize events. Now it only reacts to scroll events. To react to resize events, subscribe to the `ViewportRuler.change()` stream.
 * `UniqueSelectionDispatcher`, `UniqueSelectionDispatcherListener` and `UNIQUE_SELECTION_DISPATCHER_PROVIDER` are no longer
 available from @angular/material and instead must be imported from @angular/cdk/collections
 * `isFocusTrapEnabled` is now properly marked internal.
 * The `OverlayRef.getState` method has been renamed to `OverlayRef.getConfig`.
-* `defaultErrorStateMatcher` has been replaced by `ErrorStateMatcher`. For more info, see the [input docs](https://github.com/angular/material2/blob/master/src/material/input/input.md#custom-error-matcher).
+* `defaultErrorStateMatcher` has been replaced by `ErrorStateMatcher`. For more info, see the [input docs](https://github.com/angular/material2/blob/main/src/material/input/input.md#custom-error-matcher).
 
 ### Features
 
@@ -2128,7 +2128,7 @@ tools like webpack to more easily load _only_ the components being used in an ap
 
 * Angular Material now requires **Angular 4.4.3 or greater**
 * `MaterialModule` has been removed. ([cf1ece0](https://github.com/angular/material2/commit/cf1ece0)) (#6803)
-[See the deprecation notice from beta.3 for more information](https://github.com/angular/material2/blob/master/CHANGELOG.md#materialmodule).
+[See the deprecation notice from beta.3 for more information](https://github.com/angular/material2/blob/main/CHANGELOG.md#materialmodule).
 * `MdCoreModule` has been removed. Most of its functionality has been moved to `@angular/cdk` over
 the last few releases.
 * `FocusOriginMonitor` has been renamed to `FocusMonitor` and moved to `@angular/cdk`.
@@ -3570,7 +3570,7 @@ switch to using our UMD bundles.  Example config:
   }
 ```
 
-You can see a more detailed example in our [demo app's system config](https://github.com/angular/material2/blob/master/src/demo-app/system-config.ts).
+You can see a more detailed example in our [demo app's system config](https://github.com/angular/material2/blob/main/src/demo-app/system-config.ts).
 
 In addition to this, each component now has an `index.js` file, so you should now have imports like
 ```ts

CODING_STANDARDS.md

@@ -263,8 +263,8 @@ the same tests that the non-MDC version had. Similarly, we check that the public
 Components match that of the non-MDC version.
 
 In the case where old tests no longer make sense and should be omitted or the public API should be
-changed, you can do so in [scripts/check-mdc-tests-config.ts](https://github.com/angular/components/blob/master/scripts/check-mdc-tests-config.ts) and
-[scripts/check-mdc-exports-config.ts](https://github.com/angular/components/blob/master/scripts/check-mdc-exports-config.ts).
+changed, you can do so in [scripts/check-mdc-tests-config.ts](https://github.com/angular/components/blob/main/scripts/check-mdc-tests-config.ts) and
+[scripts/check-mdc-exports-config.ts](https://github.com/angular/components/blob/main/scripts/check-mdc-exports-config.ts).
 Remember to leave a comment explaining why the change was necessary.
 
 #### Coercion

CONTRIBUTING.md

@@ -83,7 +83,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
 * Make your changes in a new git branch:
 
      ```shell
-     git checkout -b my-fix-branch master
+     git checkout -b my-fix-branch main
      ```
 
 * Create your patch, **including appropriate test cases**.
@@ -106,15 +106,15 @@ Before you submit your Pull Request (PR) consider the following guidelines:
     git push my-fork my-fix-branch
     ```
 
-* In GitHub, send a pull request to `components:master`.
+* In GitHub, send a pull request to `components:main`.
 * If we suggest changes then:
   * Make the required updates.
   * Re-run the Angular Material test suites to ensure tests are still passing.
   * Rebase your branch and force push to your GitHub repository (this will update your Pull
     Request):
 
     ```shell
-    git rebase master -i
+    git rebase upstream/main -i
     git push -f
     ```
 
@@ -132,10 +132,10 @@ from the main (upstream) repository:
     git push my-fork --delete my-fix-branch
     ```
 
-* Check out the master branch:
+* Check out the main branch:
 
     ```shell
-    git checkout master -f
+    git checkout main -f
     ```
 
 * Delete the local branch:
@@ -144,10 +144,10 @@ from the main (upstream) repository:
     git branch -D my-fix-branch
     ```
 
-* Update your master with the latest upstream version:
+* Update your local `main` with the latest upstream version:
 
     ```shell
-    git pull --ff upstream master
+    git pull --ff upstream main
     ```
 
 ## <a name="rules"></a> Coding Rules
@@ -260,9 +260,9 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
 [material-group]: https://groups.google.com/forum/#!forum/angular-material2
 [coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md
 [commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/preview
-[commit-message-scopes]: https://github.com/angular/components/blob/master/.ng-dev/commit-message.ts#L10
+[commit-message-scopes]: https://github.com/angular/components/blob/main/.ng-dev/commit-message.ts#L10
 [corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
-[dev-doc]: https://github.com/angular/components/blob/master/DEV_ENVIRONMENT.md
+[dev-doc]: https://github.com/angular/components/blob/main/DEV_ENVIRONMENT.md
 [github]: https://github.com/angular/components
 [gitter]: https://gitter.im/angular/components
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html

README.md

@@ -18,7 +18,7 @@ own custom components. The team maintains several npm packages.
 [Documentation, demos, and guides][mat-docs] |
 [Frequently Asked Questions](FAQ.md) |
 [Community Google group](https://groups.google.com/forum/#!forum/angular-material2) |
-[Contributing](https://github.com/angular/components/blob/master/CONTRIBUTING.md) |
+[Contributing](https://github.com/angular/components/blob/main/CONTRIBUTING.md) |
 [StackBlitz Template](https://stackblitz.com/fork/components-issue)
 
 ## Getting started
@@ -86,8 +86,8 @@ We aim for great user experience with the following screen readers:
 [MDC Web]: https://github.com/material-components/material-components-web/
 [cdk-docs]: https://material.angular.io/cdk/categories
 [mat-docs]: https://material.angular.io
-[map-docs]: https://github.com/angular/components/blob/master/src/google-maps/README.md
-[ytp-docs]: https://github.com/angular/components/blob/master/src/youtube-player/README.md
+[map-docs]: https://github.com/angular/components/blob/main/src/google-maps/README.md
+[ytp-docs]: https://github.com/angular/components/blob/main/src/youtube-player/README.md
 [getting-started]: https://material.angular.io/guide/getting-started
-[contributing]: https://github.com/angular/components/blob/master/CONTRIBUTING.md
+[contributing]: https://github.com/angular/components/blob/main/CONTRIBUTING.md
 [help-wanted]: https://github.com/angular/components/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22

guides/theming.md

@@ -250,7 +250,7 @@ npm package (`@angular/material/prebuilt-themes`). To include the pre-built them
 application, [add your chosen CSS file to the `styles` array of your project's `angular.json`
 file][adding-styles].
 
-[prebuilt]: https://github.com/angular/components/blob/master/src/material/core/theming/prebuilt
+[prebuilt]: https://github.com/angular/components/blob/main/src/material/core/theming/prebuilt
 
 ### Defining multiple themes