Skip to content

Commit 0506631

Browse files
Y-LessY-Less
committed
Merge pull request #1 from angular/master
Latest sync
2 parents b1df545 + f14b212 commit 0506631

1,560 files changed

Lines changed: 67462 additions & 41402 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ sudo: false
33
node_js:
44
- '0.12'
55

6+
branches:
7+
except:
8+
- g3sync
9+
610
cache:
711
directories:
812
- node_modules
@@ -13,6 +17,8 @@ env:
1317
- KARMA_BROWSERS=DartiumWithWebPlatform
1418
- E2E_BROWSERS=Dartium
1519
- LOGS_DIR=/tmp/angular-build/logs
20+
- SAUCE_USERNAME=angular-ci
21+
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
1622
- ARCH=linux-x64
1723
# Token for tsd to increase github rate limit
1824
# See https://github.com/DefinitelyTyped/tsd#tsdrc
@@ -21,10 +27,22 @@ env:
2127
# This SSO token belongs to github account angular-github-ratelimit-token which has no access
2228
# (password is in Valentine)
2329
- TSDRC='{"token":"ef474500309daea53d5991b3079159a29520a40b"}'
30+
# GITHUB_TOKEN_ANGULAR
31+
- secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
2432
matrix:
25-
- MODE=js DART_CHANNEL=dev
26-
- MODE=dart DART_CHANNEL=stable
27-
- MODE=dart DART_CHANNEL=dev
33+
# Order: slowest build on top, so that we don't hog VMs while waiting for others to complete.
34+
- MODE=dart DART_CHANNEL=stable
35+
- MODE=dart DART_CHANNEL=dev
36+
- MODE=saucelabs DART_CHANNEL=dev
37+
- MODE=dart_experimental DART_CHANNEL=dev
38+
- MODE=js DART_CHANNEL=dev
39+
- MODE=router DART_CHANNEL=dev
40+
- MODE=lint DART_CHANNEL=dev
41+
42+
matrix:
43+
allow_failures:
44+
- env: "MODE=saucelabs DART_CHANNEL=dev"
45+
- env: "MODE=dart_experimental DART_CHANNEL=dev"
2846

2947
addons:
3048
firefox: "38.0"
@@ -49,18 +67,22 @@ install:
4967

5068
before_script:
5169
- mkdir -p $LOGS_DIR
70+
- ./scripts/ci/presubmit-queue-setup.sh
5271

5372
script:
5473
- ./scripts/ci/build_and_test.sh ${MODE}
5574

5675
after_script:
5776
- ./scripts/ci/print-logs.sh
77+
- ./scripts/ci/after-script.sh
5878

5979
notifications:
6080
webhooks:
6181
urls:
6282
- https://webhooks.gitter.im/e/1ef62e23078036f9cee4
63-
on_success: change # options: [always|never|change] default: always
83+
# trigger Buildtime Trend Service to parse Travis CI log
84+
- https://buildtimetrend.herokuapp.com/travis
85+
on_success: always # options: [always|never|change] default: always
6486
on_failure: always # options: [always|never|change] default: always
6587
on_start: false # default: false
6688
slack:
@@ -85,7 +107,6 @@ deploy:
85107
# create a "subdirectory" for each commit
86108
upload-dir: $TRAVIS_COMMIT/dart_stable
87109
on:
88-
branch: master
89110
repo: angular/angular
90111
condition: "$MODE = dart && $DART_CHANNEL = stable"
91112
- provider: gcs
@@ -98,6 +119,5 @@ deploy:
98119
local-dir: deploy
99120
upload-dir: $TRAVIS_COMMIT/js
100121
on:
101-
branch: master
102122
repo: angular/angular
103123
condition: "$MODE = js"

‎CHANGELOG.md‎

Lines changed: 789 additions & 718 deletions
Large diffs are not rendered by default.

‎COMMITTER.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Pushing changes into the Angular 2 tree
2+
3+
Please see [Using git with Angular repositories](https://docs.google.com/document/d/1h8nijFSaa1jG_UE8v4WP7glh5qOUXnYtAtJh_gwOQHI/edit)
4+
for details about how we maintain a linear commit history, and the rules for committing.
5+
6+
As a contributor, just read the instructions in [CONTRIBUTING.md](CONTRIBUTING.md) and send a pull request.
7+
Someone with committer access will do the rest.
8+
9+
## The `PR: merge` label and `presubmit-*` branches
10+
11+
We have automated the process for merging pull requests into master. Our goal is to minimize the disruption for
12+
Angular committers and also prevent breakages on master.
13+
14+
When a PR is ready to merge, a project member in the CoreTeamMember list (see below) can add the special label,
15+
`PR: merge`.
16+
A robot running as [mary-poppins](https://github.com/mary-poppins)
17+
is notified that the label was added by an authorized person,
18+
and will create a new branch in the angular project, using the convention `presubmit-{username}-pr-{number}`.
19+
20+
(Note: if the automation fails, committers can instead push the commits to a branch following this naming scheme.)
21+
22+
When a Travis build succeeds for a presubmit branch named following the convention,
23+
Travis will re-base the commits, merge to master, and close the PR automatically.
24+
25+
Finally, after merge `mary-poppins` removes the presubmit branch.
26+
27+
## Administration
28+
29+
The list of users who can trigger a merge by adding the label is stored in our appengine app datastore.
30+
Edit the contents of the [CoreTeamMember Table](
31+
https://console.developers.google.com/project/angular2-automation/datastore/query?queryType=KindQuery&namespace=&kind=CoreTeamMember)

‎CONTRIBUTING.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,14 @@ format that includes a **type**, a **scope** and a **subject**:
157157
<footer>
158158
```
159159

160+
The **header** is mandatory and the **scope** of the header is optional.
161+
160162
Any line of the commit message cannot be longer 100 characters! This allows the message to be easier
161163
to read on GitHub as well as in various git tools.
162164

165+
### Revert
166+
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.
167+
163168
### Type
164169
Must be one of the following:
165170

@@ -193,6 +198,7 @@ The body should include the motivation for the change and contrast this with pre
193198
The footer should contain any information about **Breaking Changes** and is also the place to
194199
reference GitHub issues that this commit **Closes**.
195200
201+
**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.
196202
197203
A detailed explanation can be found in this [document][commit-message-format].
198204

‎DEVELOPER.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ following products on your development machine:
3434
[Windows](http://windows.github.com)); [GitHub's Guide to Installing
3535
Git](https://help.github.com/articles/set-up-git) is a good source of information.
3636

37-
* [Node.js](http://nodejs.org), which is used to run a development web server, run tests, and
38-
generate distributable files. We also use Node's Package Manager, `npm`, which comes with Node.
39-
Depending on your system, you can install Node either from source or as a pre-packaged bundle.
37+
* [Node.js](http://nodejs.org), (version `>=0.12.0 <0.13.0`) which is used to run a development web server,
38+
run tests, and generate distributable files. We also use Node's Package Manager, `npm`
39+
(version `>=2.0 <3.0`), which comes with Node. Depending on your system, you can install Node either from
40+
source or as a pre-packaged bundle.
4041

4142
* [Chrome Canary](https://www.google.com/chrome/browser/canary.html), a version of Chrome with
4243
bleeding edge functionality, built especially for developers (and early adopters).
@@ -187,7 +188,7 @@ rights to built them in your operating system.
187188
### E2E tests
188189

189190
1. `$(npm bin)/gulp build.js.cjs` (builds benchpress and tests into `dist/js/cjs` folder).
190-
2. `$(npm bin)/gulp serve.js.prod serve.js.dart2js` (runs a local webserver).
191+
2. `$(npm bin)/gulp serve.js.prod serve.dart` (runs a local webserver).
191192
3. `$(npm bin)/protractor protractor-js.conf.js`: JS e2e tests.
192193
4. `$(npm bin)/protractor protractor-dart2js.conf.js`: dart2js e2e tests.
193194

@@ -197,7 +198,7 @@ Angular specific command line options when running protractor:
197198
### Performance tests
198199

199200
1. `$(npm bin)/gulp build.js.cjs` (builds benchpress and tests into `dist/js/cjs` folder)
200-
2. `$(npm bin)/gulp serve.js.prod serve.js.dart2js` (runs a local webserver)
201+
2. `$(npm bin)/gulp serve.js.prod serve.dart` (runs a local webserver)
201202
3. `$(npm bin)/protractor protractor-js.conf.js --benchmark`: JS performance tests
202203
4. `$(npm bin)/protractor protractor-dart2js.conf.js --benchmark`: dart2js performance tests
203204

‎NAMING.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
Naming Conventions in Angular2
2+
---
3+
4+
In general Angular2 should follow TypeScript naming conventions.
5+
See: https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines
6+
7+
8+
Classes:
9+
- Example: `Compiler`, `ApplicationMetadata`
10+
- Camel case with first letter upper-case
11+
- In general prefer single words. (This is so that when appending `Proto` or `Factory` the class
12+
is still reasonable to work with.)
13+
- Should not end with `Impl` or any other word which describes a specific implementation of an
14+
interface.
15+
16+
17+
Interfaces:
18+
- Follow the same rules as Classes
19+
- Should not have `I` or `Interface` in the name or any other way of identifying it as an interface.
20+
21+
22+
Methods and functions:
23+
- Example: `bootstrap`, `someMethod`
24+
- Should be camel case with first lower case
25+
26+
27+
Constants
28+
- Example: `CORE_DIRECTIVES`
29+
- Should be all uppercase with SNAKE_CASE
30+
31+
32+

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ applications:
1919

2020
## Quickstart
2121

22-
[Get started in 5 minutes][quickstart]
22+
[Get started in 5 minutes][quickstart].
2323

2424
## Setup & Install Angular 2
2525

‎TOOLS.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Developer Tools for Angular 2
2+
3+
- [JavaScript](TOOLS_JS.md)
4+
- [Dart](TOOLS_DART.md)

0 commit comments

Comments
 (0)