From 3d8722811b8f29bca220ee2fa26c3fabf28c1097 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Wed, 4 May 2022 15:40:53 +0000 Subject: [PATCH] build: cleanup references to old `master` branch Cleans up all referneces to the old `master` branch. --- .circleci/config.yml | 4 --- .github/ISSUE_TEMPLATE/1-bug-report.md | 2 +- .github/ISSUE_TEMPLATE/5-support-request.md | 2 +- .github/SAVED_REPLIES.md | 6 ++-- .github/angular-robot.yml | 8 +++--- .github/workflows/scorecard.yml | 6 +--- CONTRIBUTING.md | 28 +++++++++---------- README.md | 8 +++--- docs/DEVELOPER.md | 2 +- docs/design/build-system.md | 4 +-- docs/process/release.md | 2 +- .../test/hello-world-app/README.md | 2 +- packages/angular_devkit/schematics/README.md | 2 +- packages/ngtools/webpack/package.json | 2 +- scripts/templates/contributing.ejs | 26 ++++++++--------- scripts/templates/readme.ejs | 8 +++--- .../schema/serializers/schema_benchmark.json | 2 +- tests/legacy-cli/e2e_runner.ts | 2 +- 18 files changed, 54 insertions(+), 62 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f590115dc687..cb8424b40ecc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,8 +30,6 @@ var_5: &only_release_branches branches: only: - main - # TODO(BRANCH_RENAME_CLEANUP): remove - - master - /\d+\.\d+\.x/ # Executor Definitions @@ -364,8 +362,6 @@ workflows: only: - renovate/angular - main - # TODO(BRANCH_RENAME_CLEANUP): remove - - master - e2e-cli: name: e2e-cli-node-16 nodeversion: '16.10' diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md index bc0cec42df0e..66828cd92bb8 100644 --- a/.github/ISSUE_TEMPLATE/1-bug-report.md +++ b/.github/ISSUE_TEMPLATE/1-bug-report.md @@ -57,7 +57,7 @@ Share the link to the repo below along with step-by-step instructions to reprodu Issues that don't have enough info and can't be reproduced will be closed. -You can read more about issue submission guidelines here: https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md#-submitting-an-issue +You can read more about issue submission guidelines here: https://github.com/angular/angular-cli/blob/main/CONTRIBUTING.md#-submitting-an-issue --> ## 🔥 Exception or Error diff --git a/.github/ISSUE_TEMPLATE/5-support-request.md b/.github/ISSUE_TEMPLATE/5-support-request.md index 509f8d4797bc..3d88b3df0daf 100644 --- a/.github/ISSUE_TEMPLATE/5-support-request.md +++ b/.github/ISSUE_TEMPLATE/5-support-request.md @@ -8,7 +8,7 @@ about: Questions and requests for support Please do not file questions or support requests on the GitHub issues tracker. You can get your questions answered using other communication channels. Please see: -https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md#question +https://github.com/angular/angular-cli/blob/main/CONTRIBUTING.md#question Thank you! diff --git a/.github/SAVED_REPLIES.md b/.github/SAVED_REPLIES.md index 466b8ad5ee52..06fb24cd1cd6 100644 --- a/.github/SAVED_REPLIES.md +++ b/.github/SAVED_REPLIES.md @@ -29,7 +29,7 @@ Thanks for reporting this issue. However, this issue is a duplicate of # Coding Rules @@ -192,15 +192,15 @@ If the commit reverts a previous commit, it should begin with `revert: `, follow ### Type Must be one of the following: -* **build**: Changes to local repository build system and tooling +* **build**: Changes to local repository build system and tooling * **ci**: Changes to CI configuration and CI specific tooling [2] -* **docs**: Changes which exclusively affects documentation. +* **docs**: Changes which exclusively affects documentation. * **feat**: Creates a new feature [1] * **fix**: Fixes a previously discovered failure/bug [1] * **perf**: Improves performance without any change in functionality or API [1] -* **refactor**: Refactor without any change in functionality or API (includes style changes) +* **refactor**: Refactor without any change in functionality or API (includes style changes) * **release**: A release point in the repository [2] -* **test**: Improvements or corrections made to the project's test suite +* **test**: Improvements or corrections made to the project's test suite [1] This type MUST have a scope. See the next section for more information.
@@ -292,7 +292,7 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise [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/edit# [corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html -[dev-doc]: https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md#development-hints-for-working-on-angular-cli +[dev-doc]: https://github.com/angular/angular-cli/blob/main/packages/angular/cli/README.md#development-hints-for-working-on-angular-cli [GitHub]: https://github.com/angular/angular-cli [gitter]: https://gitter.im/angular/angular-cli [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html diff --git a/README.md b/README.md index 3f3fc0dfff21..0113a346e324 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@
Angular CLI logo

- The Angular CLI is a command-line interface tool that you use to initialize, develop, scaffold, + The Angular CLI is a command-line interface tool that you use to initialize, develop, scaffold,
and maintain Angular applications directly from a command shell.

@@ -37,8 +37,8 @@

- - CI status + + CI status   Discord conversation @@ -194,7 +194,7 @@ This is a monorepo which contains many tools and packages: [filestructure]: https://angular.io/guide/file-structure [node.js]: https://nodejs.org/ [npm]: https://www.npmjs.com/get-npm -[codeofconduct]: https://github.com/angular/angular/blob/master/CODE_OF_CONDUCT.md +[codeofconduct]: https://github.com/angular/angular/blob/main/CODE_OF_CONDUCT.md [twitter]: https://www.twitter.com/angular [discord]: https://discord.gg/angular [gitter]: https://gitter.im/angular/angular-cli diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md index 18cfcefb314b..ab0ba45a46c9 100644 --- a/docs/DEVELOPER.md +++ b/docs/DEVELOPER.md @@ -78,7 +78,7 @@ There are two different test suites which can be run locally: - Run a subset of the tests, use the full Bazel target example: `yarn bazel test //packages/schematics/angular:angular_test` - For a complete list of test targets use the following Bazel query: `yarn bazel query "tests(//packages/...)"` -You can find more info about debugging [tests with Bazel in the docs.](https://github.com/angular/angular-cli/blob/master/docs/process/bazel.md#debugging-jasmine_node_test) +You can find more info about debugging [tests with Bazel in the docs.](https://github.com/angular/angular-cli/blob/main/docs/process/bazel.md#debugging-jasmine_node_test) ### End to end tests diff --git a/docs/design/build-system.md b/docs/design/build-system.md index fe730f3f9fdd..fbe437ee5157 100644 --- a/docs/design/build-system.md +++ b/docs/design/build-system.md @@ -24,7 +24,7 @@ It's not strictly accurate because some options remove certain processing stages This diagram doesn't show these conditionals and only shows the possible processing steps. Relative paths, such as `./raw-css-loader.ts`, refer to internal plugins, while other names usually refer to public npm packages. -![Overview diagram](https://g.gravizo.com/source/svg?https://raw.githubusercontent.com/angular/angular-cli/master/docs/design/build-system-overview.dot) +![Overview diagram](https://g.gravizo.com/source/svg?https://raw.githubusercontent.com/angular/angular-cli/main/docs/design/build-system-overview.dot) ## Loading and processing sources @@ -128,7 +128,7 @@ We also use Terser's mangling, by which names, but not properties, are renamed t The main characteristics of Terser to keep in mind is that it operates via static analysis and does not support the indirection introduced by module loading. Thus the rest of the pipeline is directed towards providing Terser with code that can be removed via static analysis in large single modules scopes. -To this end we developed [@angular-devkit/build-optimizer](https://github.com/angular/angular-cli/tree/master/packages/angular_devkit/build_optimizer), a post-processing tool for TS code. +To this end we developed [@angular-devkit/build-optimizer](https://github.com/angular/angular-cli/tree/main/packages/angular_devkit/build_optimizer), a post-processing tool for TS code. Build Optimizer searches for code patterns produced by the TypeScript and Angular compiler that are known to inhibit dead code elimination, and converts them into equivalent structures that enable it instead (the link above contains some examples). It also adds Terser [annotations](https://github.com/terser/terser#annotations) marking top-level functions as free from side effects for libraries that have the `sideEffects` flag set to false in `package.json`. diff --git a/docs/process/release.md b/docs/process/release.md index 0465c8823f0f..eadc1a1b8e8e 100644 --- a/docs/process/release.md +++ b/docs/process/release.md @@ -14,7 +14,7 @@ The caretaker should triage issues, merge PR, and sheppard the release. Caretaker calendar can be found [here](https://calendar.google.com/calendar/embed?src=angular.io_jf53juok1lhpm84hv6bo6fmgbc%40group.calendar.google.com&ctz=America%2FLos_Angeles). Each shift consists of two caretakers. The primary caretaker is responsible for -merging PRs to master and patch whereas the secondary caretaker is responsible +merging PRs to `main` and patch whereas the secondary caretaker is responsible for the release. Primary-secondary pairs are as follows: | Primary | Secondary | diff --git a/packages/angular_devkit/build_angular/test/hello-world-app/README.md b/packages/angular_devkit/build_angular/test/hello-world-app/README.md index fa1c5ca7d3f1..563afe4d4160 100644 --- a/packages/angular_devkit/build_angular/test/hello-world-app/README.md +++ b/packages/angular_devkit/build_angular/test/hello-world-app/README.md @@ -24,4 +24,4 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac ## Further help -To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). +To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/main/README.md). diff --git a/packages/angular_devkit/schematics/README.md b/packages/angular_devkit/schematics/README.md index 7fce70c8b80d..b4f47a101e7f 100644 --- a/packages/angular_devkit/schematics/README.md +++ b/packages/angular_devkit/schematics/README.md @@ -23,7 +23,7 @@ What distinguishes Schematics from other generators, such as Yeoman or Yarn Crea # Tooling -Schematics is a library, and does not work by itself. A [reference CLI](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics_cli/bin/schematics.ts) is available on this repository, and is published on NPM at [@angular-devkit/schematics-cli](https://www.npmjs.com/package/@angular-devkit/schematics-cli). This document explains the library usage and the tooling API, but does not go into the tool implementation itself. +Schematics is a library, and does not work by itself. A [reference CLI](https://github.com/angular/angular-cli/blob/main/packages/angular_devkit/schematics_cli/bin/schematics.ts) is available on this repository, and is published on NPM at [@angular-devkit/schematics-cli](https://www.npmjs.com/package/@angular-devkit/schematics-cli). This document explains the library usage and the tooling API, but does not go into the tool implementation itself. The tooling is responsible for the following tasks: diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json index d3cdcbb43e53..ae3fe6e564e4 100644 --- a/packages/ngtools/webpack/package.json +++ b/packages/ngtools/webpack/package.json @@ -19,7 +19,7 @@ "bugs": { "url": "https://github.com/angular/angular-cli/issues" }, - "homepage": "https://github.com/angular/angular-cli/tree/master/packages/@ngtools/webpack", + "homepage": "https://github.com/angular/angular-cli/tree/main/packages/ngtools/webpack", "dependencies": {}, "peerDependencies": { "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next", diff --git a/scripts/templates/contributing.ejs b/scripts/templates/contributing.ejs index ad24aef77826..a3ab56094713 100644 --- a/scripts/templates/contributing.ejs +++ b/scripts/templates/contributing.ejs @@ -84,7 +84,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,19 +106,19 @@ Before you submit your Pull Request (PR) consider the following guidelines: git push origin my-fix-branch ``` -* In GitHub, send a pull request to `angular/angular-cli:master`. +* In GitHub, send a pull request to `angular/angular-cli:main`. * If we suggest changes then: * Make the required updates. * Re-run the Angular DevKit test suites to ensure tests are still passing. * Once your PR is approved and you are done with any follow up changes: - * Rebase to the current master to pre-emptively address any merge conflicts. + * Rebase to the current main to pre-emptively address any merge conflicts. ```shell - git rebase master -i + git rebase upstream/main -i git push -f ``` * Add the `action: merge` label and the correct -[target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target) +[target label](https://github.com/angular/angular/blob/main/docs/TRIAGE_AND_LABELS.md#pr-target) (if PR author has the project collaborator status, or else the last reviewer should do this). * The current caretaker will merge the PR to the target branch(es) within 1-2 @@ -137,10 +137,10 @@ from the main (upstream) repository: git push origin --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: @@ -149,10 +149,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 ``` ## Coding Rules @@ -196,11 +196,11 @@ Must be one of the following: const { COMMIT_TYPES, ScopeRequirement } = require('../../.ng-dev/commit-message'); for (const typeName of Object.keys(COMMIT_TYPES).sort()) { const type = COMMIT_TYPES[typeName]; -%>* **<%= typeName %>**: <%= type.description %> <% +%>* **<%= typeName %>**: <%= type.description %><% if (type.scope == ScopeRequirement.Required) { - %>[1]<% + %> [1]<% } else if (type.scope == ScopeRequirement.Forbidden) { - %>[2]<% + %> [2]<% } %> <% } %> @@ -286,7 +286,7 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise [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/edit# [corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html -[dev-doc]: https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md#development-hints-for-working-on-angular-cli +[dev-doc]: https://github.com/angular/angular-cli/blob/main/packages/angular/cli/README.md#development-hints-for-working-on-angular-cli [GitHub]: https://github.com/angular/angular-cli [gitter]: https://gitter.im/angular/angular-cli [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html diff --git a/scripts/templates/readme.ejs b/scripts/templates/readme.ejs index 481a0175c720..8083cbc39961 100644 --- a/scripts/templates/readme.ejs +++ b/scripts/templates/readme.ejs @@ -16,7 +16,7 @@
Angular CLI logo

- The Angular CLI is a command-line interface tool that you use to initialize, develop, scaffold, + The Angular CLI is a command-line interface tool that you use to initialize, develop, scaffold,
and maintain Angular applications directly from a command shell.

@@ -37,8 +37,8 @@

- - CI status + + CI status   Discord conversation @@ -222,7 +222,7 @@ for (const pkgName of Object.keys(packages)) { [filestructure]: https://angular.io/guide/file-structure [node.js]: https://nodejs.org/ [npm]: https://www.npmjs.com/get-npm -[codeofconduct]: https://github.com/angular/angular/blob/master/CODE_OF_CONDUCT.md +[codeofconduct]: https://github.com/angular/angular/blob/main/CODE_OF_CONDUCT.md [twitter]: https://www.twitter.com/angular [discord]: https://discord.gg/angular [gitter]: https://gitter.im/angular/angular-cli diff --git a/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json b/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json index 8e39ec498f1b..7ec5d5af8a7f 100644 --- a/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json +++ b/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema", - "$id": "https://github.com/angular/angular-cli/blob/master/packages/@angular/cli/lib/config/schema.json#CliConfig", + "$id": "https://github.com/angular/angular-cli/blob/main/packages/@angular/cli/lib/config/schema.json#CliConfig", "title": "Angular CLI Config Schema", "type": "object", "properties": { diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts index e4386cd324b6..c049e8ce0bc3 100644 --- a/tests/legacy-cli/e2e_runner.ts +++ b/tests/legacy-cli/e2e_runner.ts @@ -23,7 +23,7 @@ Error.stackTraceLimit = Infinity; * --noglobal Skip linking your local @angular/cli directory. Can save a few seconds. * --nosilent Never silence ng commands. * --ng-tag=TAG Use a specific tag for build snapshots. Similar to ng-snapshots but point to a - * tag instead of using the latest master. + * tag instead of using the latest `main`. * --ng-snapshots Install angular snapshot builds in the test project. * --glob Run tests matching this glob pattern (relative to tests/e2e/). * --ignore Ignore tests matching this glob pattern.