Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit 4a57e29

Browse files
devversionalan-agius4
authored andcommitted
build: clean up references to old master branch
Cleans up all referneces to the old `master` branch.
1 parent 409362e commit 4a57e29

File tree

15 files changed

+32
-32
lines changed

15 files changed

+32
-32
lines changed

.github/ISSUE_TEMPLATE/Bug.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Share the link to the repo below along with step-by-step instructions to reprodu
4747
4848
Issues that don't have enough info and can't be reproduced will be closed.
4949
50-
You can read more about issue submission guidelines here: https://github.com/angular/universal/blob/master/CONTRIBUTING.md#-submitting-an-issue
50+
You can read more about issue submission guidelines here: https://github.com/angular/universal/blob/main/CONTRIBUTING.md#-submitting-an-issue
5151
-->
5252

5353
## 🔥 Exception or Error

.github/PULL_REQUEST_TEMPLATE/Improvement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ about: You have made an improvement to Angular Universal
77

88
Please check if your PR fulfills the following requirements:
99

10-
- [ ] The commit message follows our guidelines: https://github.com/angular/universal/blob/master/CONTRIBUTING.md#commit
10+
- [ ] The commit message follows our guidelines: https://github.com/angular/universal/blob/main/CONTRIBUTING.md#commit
1111
- [ ] Tests for the changes have been added (for bug fixes / features)
1212
- [ ] Docs have been added / updated (for bug fixes / features)
1313

.github/PULL_REQUEST_TEMPLATE/New_Feature.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ about: You have implemented new functionality that you want to make part of Angu
77

88
Please check if your PR fulfills the following requirements:
99

10-
- [ ] The commit message follows our guidelines: https://github.com/angular/universal/blob/master/CONTRIBUTING.md#commit
10+
- [ ] The commit message follows our guidelines: https://github.com/angular/universal/blob/main/CONTRIBUTING.md#commit
1111
- [ ] Tests for the changes have been added (for bug fixes / features)
1212
- [ ] Docs have been added / updated (for bug fixes / features)
1313

CONTRIBUTING.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
7575
- Make your changes in a new git branch:
7676

7777
```shell
78-
git checkout -b my-fix-branch master
78+
git checkout -b my-fix-branch main
7979
```
8080

8181
- Create your patch, **including appropriate test cases**.
@@ -98,15 +98,15 @@ Before you submit your Pull Request (PR) consider the following guidelines:
9898
git push origin my-fix-branch
9999
```
100100

101-
- In GitHub, send a pull request to `universal:master`.
101+
- In GitHub, send a pull request to `universal:main`.
102102
- If we suggest changes then:
103103

104104
- Make the required updates.
105105
- Re-run the Angular 2 test suites for JS and Dart to ensure tests are still passing.
106106
- Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
107107

108108
```shell
109-
git rebase master -i
109+
git rebase upstream/main -i
110110
git push -f
111111
```
112112

@@ -123,10 +123,10 @@ from the main (upstream) repository:
123123
git push origin --delete my-fix-branch
124124
```
125125
126-
- Check out the master branch:
126+
- Check out the main branch:
127127
128128
```shell
129-
git checkout master -f
129+
git checkout main -f
130130
```
131131
132132
- Delete the local branch:
@@ -135,10 +135,10 @@ from the main (upstream) repository:
135135
git branch -D my-fix-branch
136136
```
137137
138-
- Update your master with the latest upstream version:
138+
- Update your local `main` with the latest upstream version:
139139
140140
```shell
141-
git pull --ff upstream master
141+
git pull --ff upstream main
142142
```
143143
144144
## <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
233233
[coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md
234234
[commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
235235
[corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
236-
[dev-doc]: https://github.com/angular/angular/blob/master/DEVELOPER.md
236+
[dev-doc]: https://github.com/angular/angular/blob/main/DEVELOPER.md
237237
[github]: https://github.com/angular/universal
238238
[gitter]: https://gitter.im/angular/universal
239239
[individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![CircleCI](https://circleci.com/gh/angular/universal/tree/master.svg?style=shield)](https://circleci.com/gh/angular/universal/tree/master)
1+
[![CircleCI](https://circleci.com/gh/angular/universal/tree/main.svg?style=shield)](https://circleci.com/gh/angular/universal/tree/main)
22
[![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)
33

44
# Angular Universal
@@ -24,7 +24,7 @@ The Angular Universal project is a community driven project to expand on the cor
2424

2525
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.
2626

27-
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!
27+
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!
2828

2929
# Getting Started
3030

docs/angular2-universal-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ As for your individual root files, there actually aren't many changes you'll nee
1212

1313
## Server.ts
1414

15-
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)
15+
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)
1616

1717
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:
1818

integration/clover/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
2424

2525
## Further help
2626

27-
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).
27+
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
2424

2525
## Further help
2626

27-
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).
27+
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
2424

2525
## Further help
2626

27-
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).
27+
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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import 'zone.js/dist/zone-node';
22

3+
import { APP_BASE_HREF } from '@angular/common';
34
import { ngExpressEngine } from '@nguniversal/express-engine';
45
import * as express from 'express';
6+
import { existsSync } from 'fs';
57
import { join } from 'path';
68

79
import { AppServerModule } from './src/main.server';
8-
import { APP_BASE_HREF } from '@angular/common';
9-
import { existsSync } from 'fs';
1010

1111
// The Express app is exported so that it can be used by serverless Functions.
1212
export function app(): express.Express {
@@ -16,7 +16,7 @@ export function app(): express.Express {
1616
? 'index.original.html'
1717
: 'index';
1818

19-
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
19+
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
2020
server.engine(
2121
'html',
2222
ngExpressEngine({

0 commit comments

Comments
 (0)