build: clean up references to old master branch

Cleans up all referneces to the old `master` branch.

.github/ISSUE_TEMPLATE/Bug.md

@@ -47,7 +47,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/universal/blob/master/CONTRIBUTING.md#-submitting-an-issue
+You can read more about issue submission guidelines here: https://github.com/angular/universal/blob/main/CONTRIBUTING.md#-submitting-an-issue
 -->
 
 ## 🔥 Exception or Error

.github/PULL_REQUEST_TEMPLATE/Improvement.md

@@ -7,7 +7,7 @@ about: You have made an improvement to Angular Universal
 
 Please check if your PR fulfills the following requirements:
 
-- [ ] The commit message follows our guidelines: https://github.com/angular/universal/blob/master/CONTRIBUTING.md#commit
+- [ ] The commit message follows our guidelines: https://github.com/angular/universal/blob/main/CONTRIBUTING.md#commit
 - [ ] Tests for the changes have been added (for bug fixes / features)
 - [ ] Docs have been added / updated (for bug fixes / features)
 

.github/PULL_REQUEST_TEMPLATE/New_Feature.md

@@ -7,7 +7,7 @@ about: You have implemented new functionality that you want to make part of Angu
 
 Please check if your PR fulfills the following requirements:
 
-- [ ] The commit message follows our guidelines: https://github.com/angular/universal/blob/master/CONTRIBUTING.md#commit
+- [ ] The commit message follows our guidelines: https://github.com/angular/universal/blob/main/CONTRIBUTING.md#commit
 - [ ] Tests for the changes have been added (for bug fixes / features)
 - [ ] Docs have been added / updated (for bug fixes / features)
 

CONTRIBUTING.md

@@ -75,7 +75,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**.
@@ -98,7 +98,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
   git push origin my-fix-branch
   ```
 
-- In GitHub, send a pull request to `universal:master`.
+- In GitHub, send a pull request to `universal:main`.
 - If we suggest changes then:
 
   - Make the required updates.
@@ -106,7 +106,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
   - 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
     ```
 
@@ -123,10 +123,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:
@@ -135,10 +135,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
@@ -233,7 +233,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/blob/master/DEVELOPER.md
+[dev-doc]: https://github.com/angular/angular/blob/main/DEVELOPER.md
 [github]: https://github.com/angular/universal
 [gitter]: https://gitter.im/angular/universal
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html

README.md

@@ -1,4 +1,4 @@
-[![CircleCI](https://circleci.com/gh/angular/universal/tree/master.svg?style=shield)](https://circleci.com/gh/angular/universal/tree/master)
+[![CircleCI](https://circleci.com/gh/angular/universal/tree/main.svg?style=shield)](https://circleci.com/gh/angular/universal/tree/main)
 [![Join the chat at https://gitter.im/angular/universal](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular/universal?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 # Angular Universal
@@ -24,7 +24,7 @@ The Angular Universal project is a community driven project to expand on the cor
 
 This repository will host the various tools like engines to integrate with various backends(NodeJS, ASP.NET etc.) and also extra modules and examples to help you started with server side rendering.
 
-The Universal project is driven by community contributions. Please check [our contributing guidelines](https://github.com/angular/universal/blob/master/CONTRIBUTING.md) and send us your Pull Requests!
+The Universal project is driven by community contributions. Please check [our contributing guidelines](https://github.com/angular/universal/blob/main/CONTRIBUTING.md) and send us your Pull Requests!
 
 # Getting Started
 

docs/angular2-universal-migration.md

@@ -12,7 +12,7 @@ As for your individual root files, there actually aren't many changes you'll nee
 
 ## Server.ts
 
-When it comes the underlying express-engine, things will remain fairly similar except that now, you're going to be instead doing `import { ngExpressEngine } from '@nguniversal/express-engine';` [More detailed information on the express-engine here](https://github.com/angular/universal/tree/master/modules/express-engine)
+When it comes the underlying express-engine, things will remain fairly similar except that now, you're going to be instead doing `import { ngExpressEngine } from '@nguniversal/express-engine';` [More detailed information on the express-engine here](https://github.com/angular/universal/tree/main/modules/express-engine)
 
 Make sure you remove `angular2-universal-polyfills` and any `__workaround.ts` files you may have been using (if you were using Universal with Angular > 2.1+). As for polyfills on the server, you'll instead need the following:
 

integration/clover/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).

integration/common-engine/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).

integration/express-engine-ivy-hybrid/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).

integration/express-engine-ivy-hybrid/server.ts

@@ -1,12 +1,12 @@
 import 'zone.js/dist/zone-node';
 
+import { APP_BASE_HREF } from '@angular/common';
 import { ngExpressEngine } from '@nguniversal/express-engine';
 import * as express from 'express';
+import { existsSync } from 'fs';
 import { join } from 'path';
 
 import { AppServerModule } from './src/main.server';
-import { APP_BASE_HREF } from '@angular/common';
-import { existsSync } from 'fs';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
@@ -16,7 +16,7 @@ export function app(): express.Express {
     ? 'index.original.html'
     : 'index';
 
-  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
+  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
   server.engine(
     'html',
     ngExpressEngine({

integration/express-engine-ivy/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).

integration/express-engine-ivy/server.ts

@@ -1,12 +1,12 @@
 import 'zone.js/dist/zone-node';
 
+import { APP_BASE_HREF } from '@angular/common';
 import { ngExpressEngine } from '@nguniversal/express-engine';
 import * as express from 'express';
+import { existsSync } from 'fs';
 import { join } from 'path';
 
 import { AppServerModule } from './src/main.server';
-import { APP_BASE_HREF } from '@angular/common';
-import { existsSync } from 'fs';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
@@ -16,7 +16,7 @@ export function app(): express.Express {
     ? 'index.original.html'
     : 'index';
 
-  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
+  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
   server.engine(
     'html',
     ngExpressEngine({

modules/builders/testing/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).

modules/common/README.md

@@ -9,4 +9,4 @@ The package can be installed using:
 
 ## TransferHttpCacheModule
 
-Moved to [/docs/transfer-http.md](https://github.com/angular/universal/tree/master/docs/transfer-http.md)
+Moved to [/docs/transfer-http.md](https://github.com/angular/universal/tree/main/docs/transfer-http.md)

modules/express-engine/schematics/install/files/__serverFileName@stripTsExtension__.ts

@@ -1,12 +1,12 @@
 import 'zone.js/dist/zone-node';
 
-import { ngExpressEngine } from '@nguniversal/express-engine';
+import {APP_BASE_HREF} from '@angular/common';
+import {ngExpressEngine} from '@nguniversal/express-engine';
 import * as express from 'express';
-import { join } from 'path';
+import {existsSync} from 'fs';
+import {join} from 'path';
 
-import { AppServerModule } from './src/<%= stripTsExtension(main) %>';
+import {AppServerModule} from './src/<%= stripTsExtension(main) %>';
-import { APP_BASE_HREF } from '@angular/common';
-import { existsSync } from 'fs';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
@@ -14,7 +14,7 @@ export function app(): express.Express {
   const distFolder = join(process.cwd(), '<%= browserDistDirectory %>');
   const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
 
-  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
+  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
   server.engine('html', ngExpressEngine({
     bootstrap: AppServerModule,
   }));