Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Please check if your PR fulfills the following requirements:

- [ ] The commit message follows our guidelines: https://github.com/scullyio/scully/blob/master/CONTRIBUTING.md#commit
- [ ] The commit message follows our guidelines: https://github.com/scullyio/scully/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)

Expand Down
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Stack Overflow is a much better place to ask questions since:

To save your and our time, we will systematically close all issues that are requests for general support and redirect people to Stack Overflow.

If you would like to chat about the question in real-time, you can reach out via our gitter channel (Coming soon).
If you would like to chat about the question in real-time, you can reach out via our [gitter channel](https://gitter.im/scullyio/community).

## <a name="issue"></a> Found a Bug?

Expand Down Expand Up @@ -76,7 +76,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
1. Make your changes in a new git branch:

```shell
git checkout -b my-fix-branch master
git checkout -b my-fix-branch main
```

1. Create your patch, **including appropriate test cases**.
Expand All @@ -92,15 +92,15 @@ Before you submit your Pull Request (PR) consider the following guidelines:
git push origin my-fix-branch
```

1. In GitHub, send a pull request to `scully:master`.
1. In GitHub, send a pull request to `scully:main`.

- If we suggest changes then:

- Make the required updates.
- Rebase your branch and force push to your GitHub repository (this will update your Pull Request):

```shell
git rebase master -i
git rebase main -i
git push -f
```

Expand All @@ -117,10 +117,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:
Expand All @@ -129,10 +129,10 @@ from the main (upstream) repository:
git branch -D my-fix-branch
```

- Update your master with the latest upstream version:
- Update your main with the latest upstream version:

```shell
git pull --ff upstream master
git pull --ff upstream main
```

## <a name="commit"></a> Commit Message Guidelines
Expand Down Expand Up @@ -162,7 +162,7 @@ to read on GitHub as well as in various git tools.

The footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any.

Samples from Angular Repository: (even more [samples](https://github.com/angular/angular/commits/master))
Samples from Angular Repository: (even more [samples](https://github.com/angular/angular/commits/main))

```
docs(changelog): update changelog to beta.5
Expand Down Expand Up @@ -224,7 +224,7 @@ Please sign our Contributor License Agreement (CLA) before sending pull requests
- For individuals we have a [simple click-through form][cla-individual].
- For corporations we'll need you to [print, sign and one of scan+email, fax or mail the form][cla-corporations].

[coc]: https://github.com/scullyio/scully/blob/master/CODE_OF_CONDUCT.md
[coc]: https://github.com/scullyio/scully/blob/main/CODE_OF_CONDUCT.md
[github]: https://github.com/scullyio/scully
[github-issue]: https://github.com/scullyio/scully/issues/new?assignees=&labels=bug&template=---bug-report.md&title=
[github-feature]: https://github.com/scullyio/scully/issues/new?assignees=&labels=enhancement&template=---feature-request.md&title=
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![](./assets/logos/PNG/scullyio-logo.png)]()

[![GitHub](https://img.shields.io/github/license/scullyio/scully)](https://github.com/scullyio/scully/blob/master/LICENSE)
[![GitHub](https://img.shields.io/github/license/scullyio/scully)](https://github.com/scullyio/scully/blob/main/LICENSE)
[![Gitter](https://img.shields.io/gitter/room/scullyio/community)](https://gitter.im/scullyio/community)
[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
[![CLA assistant](https://cla-assistant.io/readme/badge/scullyio/scully)](https://cla-assistant.io/scullyio/scully)
Expand Down
2 changes: 1 addition & 1 deletion apps/scully-docs/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h3>Organization</h3>
<p>
<a
target="_blank"
href="https://github.com/scullyio/scully/tree/master/assets/logos"
href="https://github.com/scullyio/scully/tree/main/assets/logos"
>Press Kit</a
>
</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/release-for-v8.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ lang: en
1. Checkout the `angular-8` branch
2. Remove version 9: `rm -fr node_modules`
3. Install version 8: `npm i`
4. Pull origin master branch: `git pull origin master`
4. Pull origin main branch: `git pull origin main`
5. Fix any merge conflicts
6. Make sure that `package.json` file has version 8
7. Build the application: `ng build @scullyio/ng-lib-v8`
Expand Down
2 changes: 1 addition & 1 deletion docs/scully-cmd-line.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Alias `--bf`. Enables Scully to start rendering a specific route.

Alias `--proxy`. Takes a relative filename for a proxy config file.

For more details look at [this](https://github.com/chimurai/http-proxy-middleware/blob/master/README.md).
For more details look at [this](https://github.com/chimurai/http-proxy-middleware/blob/main/README.md).

Scully uses the same config format as [webpackDevServer](https://webpack.js.org/configuration/dev-server/#devserverproxy).

Expand Down
2 changes: 1 addition & 1 deletion docs/showcase.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ lang: en
[![Scully Website](/assets/logos/PNG/scullyio-logo.png)](https://scully.io/)
<br />

[![soloCoding Blog](https://github.com/s0l0c0ding/solocoding/blob/master/src/assets/favicon.png)](https://solocoding.dev/)
[![soloCoding Blog](https://github.com/s0l0c0ding/solocoding/blob/main/src/assets/favicon.png)](https://solocoding.dev/)
<br />

<style>
Expand Down
2 changes: 1 addition & 1 deletion libs/ng-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.24",
"repository": {
"type": "GIT",
"url": "https://github.com/scullyio/scully/tree/master/projects/scullyio/ng-lib"
"url": "https://github.com/scullyio/scully/tree/main/projects/scullyio/ng-lib"
},
"peerDependencies": {
"@angular/common": "^9.0.0-rc.6",
Expand Down
2 changes: 1 addition & 1 deletion libs/plugins/base-href-rewrite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "Sander Elias",
"repository": {
"type": "GIT",
"url": "https://github.com/scullyio/scully/tree/master/libs/plugins/base-href-rewrite"
"url": "https://github.com/scullyio/scully/tree/main/libs/plugins/base-href-rewrite"
},
"license": "MIT"
}
2 changes: 1 addition & 1 deletion libs/scully-schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Add scully to your angular app",
"repository": {
"type": "GIT",
"url": "https://github.com/scullyio/scully/tree/master/schematics/scully"
"url": "https://github.com/scullyio/scully/tree/main/schematics/scully"
},
"scripts": {
"build": "tsc -p tsconfig.json",
Expand Down
2 changes: 1 addition & 1 deletion libs/scully/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Scully CLI",
"repository": {
"type": "GIT",
"url": "https://github.com/scullyio/scully/tree/master/scully"
"url": "https://github.com/scullyio/scully/tree/main/scully"
},
"bin": {
"scully": "./scully.js"
Expand Down
2 changes: 1 addition & 1 deletion workspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
"build": {
"builder": "@nrwl/node:package",
"options": {
"outputPath": "dist/libs/plugins/scully-plugin-flash-prevention",
"outputPath": "dist/libs/scully-plugin-flash-prevention",
"tsConfig": "libs/plugins/scully-plugin-flash-prevention/tsconfig.lib.json",
"packageJson": "libs/plugins/scully-plugin-flash-prevention/package.json",
"main": "libs/plugins/scully-plugin-flash-prevention/index.ts",
Expand Down