diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 71d1136be120..2f0d2c1177f8 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -11,7 +11,7 @@ IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION WE MIGHT CLOSE YOUR ISSUE WITHOU - [ ] bug report - [ ] feature request -- [ ] other (Please do not submit support requests here (see above)) +- [ ] other **Current behavior:** @@ -27,7 +27,8 @@ https://plnkr.co or similar (you can use this template as a starting point: http --> **AngularJS version:** 1.x.y - + **Browser:** [all | Chrome XX | Firefox XX | Edge XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ] diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9a79ea9890ee..d4c3f81373a3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,4 @@ + **What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)** @@ -15,9 +16,9 @@ **Please check if the PR fulfills these requirements** -- [ ] The commit message follows our guidelines: https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#commit-message-format -- [ ] Tests for the changes have been added (for bug fixes / features) -- [ ] Docs have been added / updated (for bug fixes / features) +- [ ] The commit message follows our [guidelines](../DEVELOPERS.md#commits) +- [ ] Fix/Feature: [Docs](../DEVELOPERS.md#documentation) have been added/updated +- [ ] Fix/Feature: Tests have been added; existing tests pass **Other information**: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 22849d948da2..e1e61391ddf1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,81 +3,97 @@ We'd love for you to contribute to our source code and to make AngularJS even better than it is today! Here are the guidelines we'd 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) - - [Further Info](#info) +* [Code of Conduct](#coc) +* [Questions and Problems](#question) +* [Issues and Bugs](#issue) +* [Feature Requests](#feature) +* [Improving Documentation](#docs) +* [Issue Submission Guidelines](#submit) +* [Pull Request Submission Guidelines](#submit-pr) +* [Signing the CLA](#cla) ## Code of Conduct Help us keep AngularJS open and inclusive. Please read and follow our [Code of Conduct][coc]. -## Got a Question or Problem? +## Questions, Bugs, Features -If you have questions about how to use AngularJS, please direct these to the [Google Group][groups] -discussion list or [StackOverflow][stackoverflow]. We are also available on [IRC][irc] and -[Gitter][gitter]. +### Got a Question or Problem? -## Found an Issue? +Do not open issues for 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 dedicated +support platforms, the best being [Stack Overflow][stackoverflow]. -If you find a bug in the source code or a mistake in the documentation, you can help us by -submitting an issue to our [GitHub Repository][github]. Even better you can submit a Pull Request -with a fix. +Stack Overflow is a much better place to ask questions since: -**Localization Issues:** AngularJS uses the [Google Closure I18N library] to generate -its own I18N files (the ngLocale module). This means that any changes to these files would be lost -the next time that we import the library. +- there are thousands of people willing to help on Stack Overflow +- questions and answers stay available for public viewing so your question / answer might help + someone else +- Stack Overflow's voting system assures that the best answers are prominently visible. + +To save your and our time, we will systematically close all issues that are requests for general +support and redirect people to the section you are reading right now. + +Other channels for support are: +- the [Google Group][groups] discussion list +- the [AngularJS IRC][irc] +- the [AngularJS Gitter][gitter] + +### Found an Issue or Bug? + +If you find a bug in the source code, you can help us by submitting an issue to our +[GitHub Repository][github]. Even better, you can submit a Pull Request with a fix. + +**Please see the [Submission Guidelines](#submit) below.** + +**Special Note for Localization Issues:** AngularJS uses the [Google Closure I18N library] to +generate its own I18N files (the ngLocale module). This means that any changes to these files +would be lost the next time that we import the library. Since the Closure library i18n data is itself auto-generated from the data of the [Common Locale Data Repository (CLDR)] project, errors in the data should be reported there. See also the [Closure guide to i18n changes]. -**Please see the [Submission Guidelines](#submit) below.** +### Missing a Feature? -## Want a Feature? +You can request a new feature by submitting an issue to our [GitHub Repository][github-issues]. -You can request a new feature by submitting an issue to our [GitHub Repository][github]. If you -would like to implement a new feature then consider what kind of change it is: +If you would like to implement a new feature then consider what kind of change it is: -* **Major Changes** that you wish to contribute to the project should be discussed first on our - [dev mailing list][angular-dev] or [IRC][irc] so that we can 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 Changes** can be crafted and submitted to the [GitHub Repository][github] as a Pull - Request. +* **Major Changes** that you wish to contribute to the project should be discussed first in an + [GitHub issue][github-issues] that clearly outlines the changes and benefits of the feature. +* **Small Changes** can directly be crafted and submitted to the [GitHub Repository][github] + as a Pull Request. See the section about [Pull Request Submission Guidelines](#submit-pr), and + for detailed information the [core development documentation][developers]. +### Want a Doc Fix? -## Want a Doc Fix? +Should you have a suggestion for the documentation, you can open an issue and outline the problem +or improvement you have - however, creating the doc fix yourself is much better! If you want to help improve the docs, it's a good idea to let others know what you're working on to minimize duplication of effort. Create a new issue (or comment on a related existing one) to let others know what you're working on. +If you're making a small change (typo, phrasing) don't worry about filing an issue first. Use the +friendly blue "Improve this doc" button at the top right of the doc page to fork the repository +in-place and make a quick change on the fly. The commit message is preformatted to the right type +and scope, so you only have to add the description. + For large fixes, please build and test the documentation before submitting the PR to be sure you haven't accidentally introduced any layout or formatting issues. You should also make sure that your -commit message starts with "docs" and follows the **[Commit Message Guidelines](#commit)** outlined -below. +commit message follows the **[Commit Message Guidelines][developers.commits]**. -If you're just making a small change, don't worry about filing an issue first. Use the friendly blue -"Improve this doc" button at the top right of the doc page to fork the repository in-place and make -a quick change on the fly. When naming the commit, it is advised to follow the commit message -guidelines below, by starting the commit message with **docs** and referencing the filename. Since -this is not obvious and some changes are made on the fly, this is not strictly necessary and we will -understand if this isn't done the first few times. - -## Submission Guidelines - -### Submitting an Issue +## Issue Submission Guidelines Before you submit your issue search the archive, maybe your question was already answered. If your issue appears to be a bug, and hasn't been reported, open a new issue. Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues. -Providing the following information will increase the chances of your issue being dealt with -quickly: + +The "[new issue][github-new-issue]" form contains a number of prompts that you should fill out to +make it easier to understand and categorize the issue. + +In general, providing the following information will increase the chances of your issue being dealt +with quickly: * **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps * **Motivation for or Use Case** - explain why this is a bug for you @@ -89,38 +105,40 @@ quickly: * **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be causing the problem (line of code or commit) -Here is a great example of a well defined issue: https://github.com/angular/angular.js/issues/5069 +Here is a great example of a well defined issue: https://github.com/angular/angular.js/issues/5069. **If you get help, help others. Good karma rulez!** -### Submitting a Pull Request +## Pull Request Submission Guidelines Before you submit your pull request consider the following guidelines: * Search [GitHub](https://github.com/angular/angular.js/pulls) for an open or closed Pull Request that relates to your submission. You don't want to duplicate effort. -* Please sign our [Contributor License Agreement (CLA)](#cla) before sending pull - requests. We cannot accept code without this. +* Create the [development environment][developers.setup] * 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 AngularJS test suite, as described in the [developer documentation][dev-doc], - and ensure that all tests pass. +* Create your patch commit, **including appropriate test cases**. +* Follow our [Coding Rules][developers.rules]. +* If the changes affect public APIs, change or add relevant [documentation][developers.documentation]. +* Run the AngularJS [unit][developers.tests-unit] and [E2E test][developers.tests-e2e] suites, and ensure that all tests + pass. It is generally sufficient to run the tests only on Chrome, as our Travis integration will + run the tests on all supported browsers. +* Run `grunt eslint` to check that you have followed the automatically enforced coding rules * Commit your changes using a descriptive commit message that follows our - [commit message conventions](#commit) and passes our commit message presubmit hook - (`validate-commit-msg.js`). Adherence to the [commit message conventions](#commit) is required, - because release notes are automatically generated from these messages. + [commit message conventions][developers.commits]. Adherence to the + [commit message conventions][developers.commits] is required, 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. -* Build your changes locally to ensure all the tests pass: +* Before creating the Pull Request, package and run all tests a last time: ```shell grunt test @@ -132,24 +150,30 @@ Before you submit your pull request consider the following guidelines: git push origin my-fix-branch ``` -In GitHub, send a pull request to `angular.js:master`. -If we suggest changes, then: +* In GitHub, send a pull request to `angular.js:master`. This will trigger the check of the +[Contributor License Agreement](#cla) and the Travis integration. + +* If you find that the Travis integration has failed, look into the logs on Travis to find out +if your changes caused test failures, the commit message was malformed etc. If you find that the +tests failed or times out for unrelated reasons, you can ping a team member so that the build can be +restarted. + +* If we suggest changes, then: -* Make the required updates. -* Re-run the AngularJS test suite to ensure tests are still passing. -* Commit your changes to your branch (e.g. `my-fix-branch`). -* Push the changes to your GitHub repository (this will update your Pull Request). + * Make the required updates. + * Re-run the AngularJS test suite to ensure tests are still passing. + * Commit your changes to your branch (e.g. `my-fix-branch`). + * Push the changes to your GitHub repository (this will update your Pull Request). -If the PR gets too outdated we may ask you to rebase and force push to update the PR: + You can also amend the initial commits and force push them to the branch. -```shell -git rebase master -i -git push origin my-fix-branch -f -``` + ```shell + git rebase master -i + git push origin my-fix-branch -f + ``` -_WARNING: Squashing or reverting commits and force-pushing thereafter may remove GitHub comments -on code that were previously made by you or others in your commits. Avoid any form of rebasing -unless necessary._ + This is generally easier to follow, but seperate commits are useful if the Pull Request contains + iterations that might be interesting to see side-by-side. That's it! Thank you for your contribution! @@ -182,135 +206,41 @@ from the main (upstream) repository: 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-testing]. -* All public API methods **must be documented** with ngdoc, an extended version of jsdoc (we added - support for markdown and templating via @ngdoc tag). To see how we document our APIs, please check - out the existing source code and see [this wiki page][ngDocs]. -* With the exceptions listed below, we follow the rules contained in - [Google's JavaScript Style Guide][js-style-guide]: - * **Do not use namespaces**: Instead, wrap the entire AngularJS code base in an anonymous closure and - export our API explicitly rather than implicitly. - * Wrap all code at **100 characters**. - * Instead of complex inheritance hierarchies, we **prefer simple objects**. We use prototypal - inheritance only when absolutely necessary. - * We **love functions and closures** and, whenever possible, prefer them over objects. - * To write concise code that can be better minified, we **use aliases internally** that map to the - external API. See our existing code to see what we mean. - * We **don't go crazy with type annotations** for private internal APIs unless it's an internal API - that is used throughout AngularJS. The best guidance is to do what makes the most sense. - -## Git Commit 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 AngularJS change log**. - -The commit message formatting can be added using a typical git workflow or through the use of a CLI -wizard ([Commitizen](https://github.com/commitizen/cz-cli)). To use the wizard, run `yarn run commit` -in your terminal after staging your changes in git. - -### 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**: +## Signing the Contributor License Agreement (CLA) -``` -(): - - - -