ci: add CONTRIBUTING as a template and various changes

Added types from the commit validation script to CONTRIBUTING. Added
packages names from the package script to the scope section. Added
examples of good commit messages.

Also corrected some texts.
This commit is contained in:
Hans 2018-10-02 12:11:01 -07:00
parent 5f8230cca1
commit 202117a68e
7 changed files with 420 additions and 84 deletions

View File

@ -180,41 +180,65 @@ If the commit reverts a previous commit, it should begin with `revert: `, follow
### Type
Must be one of the following:
* **build**: Changes that affect the build system or external dependencies
* **ci**: Changes to our CI configuration files and scripts
* **docs**: Documentation only changes
* **feat**: A new feature
* **fix**: A bug fix
* **perf**: A code change that improves performance
* **build**: Changes that affect the build system or external dependencies. [2]
* **ci**: Changes to our CI configuration files and scripts. [2]
* **docs**: Documentation only changes.
* **feat**: A new feature. [1]
* **fix**: A bug fix. [1]
* **refactor**: A code change that neither fixes a bug nor adds a feature
* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
* **test**: Adding missing tests or correcting existing tests
* **release**: A release commit. Must only include version changes. [2]
* **revert**: A git commit revert. The description must include the original commit message. [2]
* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc).
* **test**: Adding missing tests or correcting existing tests.
<sup>[1] This type MUST have a scope. See the next section for more information.</sup><br/>
<sup>[2] This type MUST NOT have a scope. It only applies to general scripts and tooling.</sup>
### Scope
The scope should be the name of the npm package affected as perceived by the person reading changelog generated from the commit messages.
The following is the list of supported scopes:
* **@angular-devkit/core**
* **@angular/cli**
* **@angular/pwa**
* **@angular-devkit/architect**
* **@angular-devkit/architect-cli**
* **@angular-devkit/build-angular**
* **@angular-devkit/build-ng-packagr**
* **@angular-devkit/build-optimizer**
* **@angular-devkit/build-webpack**
* **@angular-devkit/core**
* **@angular-devkit/schematics**
* **@angular-devkit/schematics-cli**
* **@ngtools/webpack**
* **@schematics/angular**
* **@schematics/schematics**
* **@schematics/update**
There are currently a few exceptions to the "use package name" rule:
* **packaging**: used for changes that change the npm package layout in all of our packages, e.g. public path changes, package.json changes done to all packages, d.ts file/format changes, changes to bundles, etc.
* **changelog**: used for updating the release notes in CHANGELOG.md
* none/empty string: useful for `style`, `test` and `refactor` changes that are done across all packages (e.g. `style: add missing semicolons`)
### Subject
The subject contains succinct description of the change:
* use the imperative, present tense: "change" not "changed" nor "changes"
* don't capitalize first letter
* be concise and direct
* no dot (.) at the end
### Examples
Examples of valid commit messages:
* `fix(@angular/cli): prevent the flubber from grassing`
* `refactor(@schematics/angular): move all JSON classes together`
Examples of invalid commit messages:
* `fix(@angular/cli): add a new XYZ command`
This is a feature, not a fix.
* `ci(@angular/cli): fix publishing workflow`
The `ci` type cannot have a scope.
### Body
Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
The body should include the motivation for the change and contrast this with previous behavior.

View File

@ -25,28 +25,25 @@ This is the home of the DevKit and the Angular CLI code. You can find the Angula
----
This is the home for all the tools and libraries built to assist developers with their Angular applications.
### Quick Links
[Gitter](https://gitter.im/angular/angular-cli) | [Contributing](https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md) | [Angular CLI](http://github.com/angular/angular-cli) |
|---|---|---|
----
## The Goal of Angular CLI
The Angular CLI creates, manages, builds and test your Angular projects. It's built on top of the
Angular DevKit.
## The Goal of DevKit
Our goal is to provide a large set of libraries that can be used to manage, develop, deploy and
DevKit's goal is to provide a large set of libraries that can be used to manage, develop, deploy and
analyze your code.
This is the extension of the Angular CLI Project. Once this set of tools is done, the Angular CLI
as it is today will become one of many interfaces available to perform those tasks. Everything
will also be available to third party tools and IDEs.
## Tools
# Tools
| Project | Package | Version | Links |
|---|---|---|---|
@ -55,7 +52,7 @@ will also be available to third party tools and IDEs.
## Packages
# Packages
This is a monorepo which contains many packages:

View File

@ -9,17 +9,27 @@
import { logging } from '@angular-devkit/core';
import * as fs from 'fs';
import * as path from 'path';
import { packages } from '../lib/packages';
export default function(_options: {}, logger: logging.Logger) {
const monorepo = require('../.monorepo.json');
logger.info('Building README...');
const readme = require('./templates/readme').default;
const content = readme({
monorepo,
packages,
function _runTemplate(inputPath: string, outputPath: string, logger: logging.Logger) {
inputPath = path.resolve(__dirname, inputPath);
outputPath = path.resolve(__dirname, outputPath);
logger.info(`Building ${path.relative(path.dirname(__dirname), outputPath)}...`);
const template = require(inputPath).default;
const content = template({
monorepo: require('../.monorepo.json'),
packages: require('../lib/packages').packages,
encode: (x: string) => global.encodeURIComponent(x),
require: (x: string) => require(path.resolve(path.dirname(inputPath), x)),
});
fs.writeFileSync(path.join(__dirname, '../README.md'), content, 'utf-8');
fs.writeFileSync(outputPath, content, 'utf-8');
}
export default async function(_options: {}, logger: logging.Logger): Promise<number> {
_runTemplate('./templates/readme', '../README.md', logger);
_runTemplate('./templates/contributing', '../CONTRIBUTING.md', logger);
return 1;
}

View File

@ -0,0 +1,265 @@
# Contributing to Angular DevKit
We would love for you to contribute to DevKit and help make it even better
than it is today! As a contributor, here are the guidelines we would like you
to follow:
- [Code of Conduct](#coc)
- [Question or Problem?](#question)
- [Issues and Bugs](#issue)
- [Feature Requests](#feature)
- [Submission Guidelines](#submit)
- [Coding Rules](#rules)
- [Commit Message Guidelines](#commit)
- [Signing the CLA](#cla)
## <a name="coc"></a> Code of Conduct
Help us keep Angular open and inclusive. Please read and follow our [Code of Conduct][coc].
## <a name="question"></a> Got a Question or Problem?
Please, do not open issues for the general support questions as we want to keep GitHub issues for
bug reports and feature requests. You've got much better chances of getting your question answered
on [StackOverflow](https://stackoverflow.com/questions/tagged/angular-devkit) where the questions
should be tagged with tag `angular-cli` or `angular-devkit`.
StackOverflow is a much better place to ask questions since:
- there are thousands of people willing to help on StackOverflow
- questions and answers stay available for public viewing so your question / answer might help someone else
- StackOverflow's voting system assures that the best answers are prominently visible.
To save your and our time we will be systematically closing all the issues that are requests for
general support and redirecting people to StackOverflow.
If you would like to chat about the question in real-time, you can reach out via [our gitter channel][gitter].
## <a name="issue"></a> Found an Issue?
If you find a bug in the source code or a mistake in the documentation, you can help us by
[submitting an issue](#submit-issue) to our [GitHub Repository][github]. Even better, you can
[submit a Pull Request](#submit-pr) with a fix.
## <a name="feature"></a> Want a Feature?
You can *request* a new feature by [submitting an issue](#submit-issue) to our [GitHub
Repository][github]. If you would like to *implement* a new feature, please submit an issue with
a proposal for your work first, to be sure that we can use it.
Please consider what kind of change it is:
* For a **Major Feature**, first open an issue and outline your proposal so that it can be
discussed. This will also allow us to better coordinate our efforts, prevent duplication of work,
and help you to craft the change so that it is successfully accepted into the project.
* **Small Features** can be crafted and directly [submitted as a Pull Request](#submit-pr).
## <a name="submit"></a> Submission Guidelines
### <a name="submit-issue"></a> Submitting an Issue
Before you submit an issue, please search the issue tracker, maybe an issue for your problem already exists and the discussion might inform you of workarounds readily available.
We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it. Having a reproducible scenario gives us wealth of important information without going back & forth to you with additional questions like:
- version of Angular CLI used
- `.angular-cli.json` or `angular.json` configuration
- version of Angular DevKit used
- 3rd-party libraries and their versions
- and most importantly - a use-case that fails
A minimal reproduce scenario using allows us to quickly confirm a bug (or point out coding problem) as well as confirm that we are fixing the right problem.
We will be insisting on a minimal reproduce scenario in order to save maintainers time and ultimately be able to fix more bugs. Interestingly, from our experience users often find coding problems themselves while preparing a minimal repository. We understand that sometimes it might be hard to extract essentials bits of code from a larger code-base but we really need to isolate the problem before we can fix it.
Unfortunately we are not able to investigate / fix bugs without a minimal reproduction, so if we don't hear back from you we are going to close an issue that don't have enough info to be reproduced.
You can file new issues by filling out our [new issue form](https://github.com/angular/angular-cli/issues/new).
### <a name="submit-pr"></a> Submitting a Pull Request (PR)
Before you submit your Pull Request (PR) consider the following guidelines:
* Search [GitHub](https://github.com/angular/angular-cli/pulls) for an open or closed PR
that relates to your submission. You don't want to duplicate effort.
* Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
We cannot accept code without this.
* Make your changes in a new git branch:
```shell
git checkout -b my-fix-branch master
```
* Create your patch, **including appropriate test cases**.
* Follow our [Coding Rules](#rules).
* Run the full Angular CLI and DevKit test suite, as described in the [developer documentation][dev-doc],
and ensure that all tests pass (coming soon).
* Commit your changes using a descriptive commit message that follows our
[commit message conventions](#commit). Adherence to these conventions
is necessary because release notes are automatically generated from these messages.
```shell
git commit -a
```
Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
* Push your branch to GitHub:
```shell
git push origin my-fix-branch
```
* In GitHub, send a pull request to `devkit:master`.
* If we suggest changes then:
* Make the required updates.
* Re-run the Angular DevKit 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 push -f
```
That's it! Thank you for your contribution!
#### After your pull request is merged
After your pull request is merged, you can safely delete your branch and pull the changes
from the main (upstream) repository:
* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
```shell
git push origin --delete my-fix-branch
```
* Check out the master branch:
```shell
git checkout master -f
```
* Delete the local branch:
```shell
git branch -D my-fix-branch
```
* Update your master with the latest upstream version:
```shell
git pull --ff upstream master
```
## <a name="rules"></a> Coding Rules
To ensure consistency throughout the source code, keep these rules in mind as you are working:
* All features or bug fixes **must be tested** by one or more specs (unit-tests or e2e-tests).
* All public API methods **must be documented**. (Details TBC).
* We follow [Google's JavaScript Style Guide][js-style-guide], but wrap all code at
**100 characters**.
## <a name="commit"></a> Commit Message Guidelines
We have very precise rules over how our git commit messages can be formatted. This leads to **more
readable messages** that are easy to follow when looking through the **project history**. But also,
we use the git commit messages to **generate the Angular DevKit change log**.
### Commit Message Format
Each commit message consists of a **header**, a **body** and a **footer**. The header has a special
format that includes a **type**, a **scope** and a **subject**:
```
<type>(<scope>): <subject>
<BLANK LINE>
<body>
<BLANK LINE>
<footer>
```
The **header** is mandatory and the **scope** of the header is optional.
Any line of the commit message cannot be longer 100 characters! This allows the message to be easier
to read on GitHub as well as in various git tools.
### Revert
If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
### Type
Must be one of the following:
<%
const { types, Scope } = require('../validate-commits');
for (const typeName of Object.keys(types).sort()) {
const type = types[typeName];
%>* **<%= typeName %>**: <%= type.description %> <%
if (type.scope == Scope.MustHave) {
%>[1]<%
} else if (type.scope == Scope.MustNotHave) {
%>[2]<%
}
%>
<% } %>
<sup>[1] This type MUST have a scope. See the next section for more information.</sup><br/>
<sup>[2] This type MUST NOT have a scope. It only applies to general scripts and tooling.</sup>
### Scope
The scope should be the name of the npm package affected as perceived by the person reading changelog generated from the commit messages.
The following is the list of supported scopes:
<%
for (const packageName of Object.keys(packages).filter(x => !packages[x].private)) {
%>* **<%= packageName %>**
<% } %>
### Subject
The subject contains succinct description of the change:
* use the imperative, present tense: "change" not "changed" nor "changes"
* don't capitalize first letter
* be concise and direct
* no dot (.) at the end
### Examples
Examples of valid commit messages:
* `fix(@angular/cli): prevent the flubber from grassing`
* `refactor(@schematics/angular): move all JSON classes together`
Examples of invalid commit messages:
* `fix(@angular/cli): add a new XYZ command`
This is a feature, not a fix.
* `ci(@angular/cli): fix publishing workflow`
The `ci` type cannot have a scope.
### Body
Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
The body should include the motivation for the change and contrast this with previous behavior.
### Footer
The footer should contain any information about **Breaking Changes** and is also the place to
reference GitHub issues that this commit **Closes**.
**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.
A detailed explanation can be found in this [document][commit-message-format].
## <a name="cla"></a> Signing the CLA
Please sign our Contributor License Agreement (CLA) before sending pull requests. For any code
changes to be accepted, the CLA must be signed. It's a quick process, we promise!
* For individuals we have a [simple click-through form][individual-cla].
* For corporations we'll need you to
[print, sign and one of scan+email, fax or mail the form][corporate-cla].
[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]: ttps://github.com/angular/angular-cli/blob/master/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
[js-style-guide]: https://google.github.io/styleguide/jsguide.html
[stackoverflow]: http://stackoverflow.com/questions/tagged/angular-devkit

View File

@ -29,10 +29,6 @@ This is the home of the DevKit and the Angular CLI code. You can find the Angula
<% } %>
----
This is the home for all the tools and libraries built to assist developers with their Angular applications.
### Quick Links
<% for (const link of Object.keys(monorepo.links)) {
%>[<%= link %>](<%= monorepo.links[link] %>) | <%
@ -41,17 +37,18 @@ This is the home for all the tools and libraries built to assist developers with
%>|---<%
} %>|
----
## The Goal of Angular CLI
The Angular CLI creates, manages, builds and test your Angular projects. It's built on top of the
Angular DevKit.
## The Goal of DevKit
Our goal is to provide a large set of libraries that can be used to manage, develop, deploy and
DevKit's goal is to provide a large set of libraries that can be used to manage, develop, deploy and
analyze your code.
This is the extension of the Angular CLI Project. Once this set of tools is done, the Angular CLI
as it is today will become one of many interfaces available to perform those tasks. Everything
will also be available to third party tools and IDEs.
<%
const sections = [
...new Set(Object.keys(packages).map(pkgName => monorepo.packages[pkgName].section ))
@ -59,7 +56,7 @@ will also be available to third party tools and IDEs.
sections.unshift(undefined);
%>
## Tools
# Tools
| Project | Package | Version | Links |
|---|---|---|---|
@ -87,7 +84,7 @@ if (mrPkg.snapshotRepo) {
<% } %>
## Packages
# Packages
This is a monorepo which contains many packages:
<% for (const section of sections) {

View File

@ -28,6 +28,62 @@ const blacklist = [
];
export enum Scope {
MustHave = 0,
MustNotHave = 1,
Either = 2,
}
export const types: { [t: string]: { description: string, scope: Scope } } = {
// Types that can contain both a scope or no scope.
'docs': {
description: 'Documentation only changes.',
scope: Scope.Either,
},
'refactor': {
description: 'A code change that neither fixes a bug nor adds a feature',
scope: Scope.Either,
},
'style': {
description: 'Changes that do not affect the meaning of the code (white-space, formatting, '
+ 'missing semi-colons, etc).',
scope: Scope.Either,
},
'test': {
description: 'Adding missing tests or correcting existing tests.',
scope: Scope.Either,
},
// Types that MUST contain a scope.
'feat': {
description: 'A new feature.',
scope: Scope.MustHave,
},
'fix': {
description: 'A bug fix.',
scope: Scope.MustHave,
},
// Types that MUST NOT contain a scope.
'build': {
description: 'Changes that affect the build system or external dependencies.',
scope: Scope.MustNotHave,
},
'revert': {
description: 'A git commit revert. The description must include the original commit message.',
scope: Scope.MustNotHave,
},
'ci': {
description: 'Changes to our CI configuration files and scripts.',
scope: Scope.MustNotHave,
},
'release': {
description: 'A release commit. Must only include version changes.',
scope: Scope.MustNotHave,
},
};
export interface ValidateCommitsOptions {
ci?: boolean;
base?: string;
@ -96,21 +152,19 @@ export default function (argv: ValidateCommitsOptions, logger: logging.Logger) {
}
const [type, scope] = subject.slice(1);
switch (type) {
// Types that can contain both a scope or no scope.
case 'docs':
case 'refactor':
case 'style':
case 'test':
if (!(type in types)) {
_invalid(sha, message, 'has an unknown type. You can use wip: to avoid this.');
continue;
}
switch (types[type].scope) {
case Scope.Either:
if (scope && !packages[scope]) {
_invalid(sha, message, 'has a scope that does not exist');
continue;
}
break;
// Types that MUST contain a scope.
case 'feat':
case 'fix':
case Scope.MustHave:
if (!scope) {
_invalid(sha, message, 'should always have a scope');
continue;
@ -121,36 +175,24 @@ export default function (argv: ValidateCommitsOptions, logger: logging.Logger) {
}
break;
// Types that MUST NOT contain a scope.
case 'build':
case 'revert':
case 'ci':
case Scope.MustNotHave:
if (scope) {
_invalid(sha, message, 'should not have a scope');
continue;
}
break;
case 'release':
if (scope) {
_invalid(sha, message, 'should not have a scope');
continue;
}
// Custom validation.
if (type == 'release') {
if (argv.ci && commits.length > 1) {
_invalid(sha, message, 'release should always be alone in a PR');
continue;
}
break;
case 'wip':
} else if (type == 'wip') {
if (argv.ci) {
_invalid(sha, message, 'wip are not allowed in a PR');
}
break;
// Unknown types.
default:
_invalid(sha, message, 'has an unknown type. You can use wip: to avoid this.');
}
}

View File

@ -16,8 +16,6 @@ import validateLicenses from './validate-licenses';
export default async function (options: { verbose: boolean }, logger: logging.Logger) {
let error = false;
logger.info('Running templates validation...');
const templateLogger = logger.createChild('templates');
if (execSync(`git status --porcelain`).toString()) {
logger.error('There are local changes.');
if (!options.verbose) {
@ -25,7 +23,10 @@ export default async function (options: { verbose: boolean }, logger: logging.Lo
}
error = true;
}
templates({}, templateLogger);
logger.info('Running templates validation...');
const templateLogger = logger.createChild('templates');
await templates({}, templateLogger);
if (execSync(`git status --porcelain`).toString()) {
logger.error(tags.oneLine`
Running templates updated files... Please run "devkit-admin templates" before submitting