From 202117a68e562f5686ebe725d67dbd5f10b54ad1 Mon Sep 17 00:00:00 2001 From: Hans Date: Tue, 2 Oct 2018 12:11:01 -0700 Subject: [PATCH] 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. --- CONTRIBUTING.md | 54 ++++-- README.md | 21 +-- scripts/templates.ts | 28 ++- scripts/templates/contributing.ejs | 265 +++++++++++++++++++++++++++++ scripts/templates/readme.ejs | 21 +-- scripts/validate-commits.ts | 108 ++++++++---- scripts/validate.ts | 7 +- 7 files changed, 420 insertions(+), 84 deletions(-) create mode 100644 scripts/templates/contributing.ejs diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e93eef5415..8c56b4741a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 -* **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 +* **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 +* **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. + + +[1] This type MUST have a scope. See the next section for more information.
+[2] This type MUST NOT have a scope. It only applies to general scripts and tooling. ### 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. diff --git a/README.md b/README.md index 762e1ad325..5f0e447aff 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/scripts/templates.ts b/scripts/templates.ts index f403d78ac2..f1921ebaa2 100644 --- a/scripts/templates.ts +++ b/scripts/templates.ts @@ -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 { + _runTemplate('./templates/readme', '../README.md', logger); + _runTemplate('./templates/contributing', '../CONTRIBUTING.md', logger); + + return 1; } diff --git a/scripts/templates/contributing.ejs b/scripts/templates/contributing.ejs new file mode 100644 index 0000000000..73fd2f5553 --- /dev/null +++ b/scripts/templates/contributing.ejs @@ -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) + +## Code of Conduct +Help us keep Angular open and inclusive. Please read and follow our [Code of Conduct][coc]. + +## 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]. + +## 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. + +## 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). + +## Submission Guidelines + +### 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). + + +### 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 + ``` + +## 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**. + +## 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**: + +``` +(): + + + +