angular · usernamealreadyis · Sep 18, 2015 · Sep 17, 2015 · Sep 17, 2015 · Sep 18, 2015
diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,8 @@ pubspec.lock
 .idea/
 *.swo
 modules/.settings
+.vscode
+modules/.vscode
 
 # Don't check in secret files
 *secret.js
@@ -39,3 +41,6 @@ modules/.settings
 npm-debug.log
 
 /docs/bower_components/
+
+# build-analytics
+.build-analytics
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 sudo: false
 node_js:
-- '0.12'
+- '4.1.1'
 
 branches:
   except:
@@ -20,6 +20,8 @@ env:
   - SAUCE_USERNAME=angular-ci
   - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
   - ARCH=linux-x64
+  - DART_DEV_VERSION=latest
+  - DART_STABLE_VERSION=latest
   # Token for tsd to increase github rate limit
   # See https://github.com/DefinitelyTyped/tsd#tsdrc
   # This does not use http://docs.travis-ci.com/user/environment-variables/#Secure-Variables
@@ -31,16 +33,18 @@ env:
   - secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
   matrix:
     # Order: slowest build on top, so that we don't hog VMs while waiting for others to complete.
-    - MODE=dart DART_CHANNEL=stable
-    - MODE=dart DART_CHANNEL=dev
-    - MODE=saucelabs DART_CHANNEL=dev
-    - MODE=dart_experimental DART_CHANNEL=dev
-    - MODE=js DART_CHANNEL=dev
-    - MODE=lint DART_CHANNEL=dev
+    - MODE=dart DART_CHANNEL=stable DART_VERSION=$DART_STABLE_VERSION
+    - MODE=dart DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=saucelabs DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=dart_experimental DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=js DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=router DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
+    - MODE=lint DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION
 
 matrix:
   allow_failures:
-  - env: "MODE=saucelabs DART_CHANNEL=dev"
+  - env: "MODE=saucelabs DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
+  - env: "MODE=dart_experimental DART_CHANNEL=dev DART_VERSION=$DART_DEV_VERSION"
 
 addons:
   firefox: "38.0"
@@ -50,13 +54,14 @@ before_install:
 - export DISPLAY=:99.0
 - export GIT_SHA=$(git rev-parse HEAD)
 - ./scripts/ci/init_android.sh
-- ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${ARCH}
+- ./scripts/ci/install_dart.sh ${DART_CHANNEL} ${DART_VERSION} ${ARCH}
 - sh -e /etc/init.d/xvfb start
 - if [[ -e SKIP_TRAVIS_TESTS ]]; then { cat SKIP_TRAVIS_TESTS ; exit 0; } fi
+- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && SAUCE_USERNAME="angular2-ci" && SAUCE_ACCESS_KEY="693ebc16208a-0b5b-1614-8d66-a2662f4e" || true'
 
 install:
   # Update npm
-  - npm install -g npm@2.9.1
+  - npm install -g npm@2.14.5
   - npm --version
   # Check the size of caches
   - du -sh ./node_modules || true

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/DEVELOPER.md b/DEVELOPER.md
@@ -22,21 +22,23 @@ if you'd like to contribute to Angular.
 Before you can build and test Angular, you must install and configure the
 following products on your development machine:
 
-* [Dart](https://www.dartlang.org) (version ` >=1.10.0-dev.1.10 <2.0.0`), specifically the Dart-SDK and
+* [Dart](https://www.dartlang.org) (version ` >=1.12.0 <2.0.0`), specifically the Dart-SDK and
   Dartium (a version of [Chromium](http://www.chromium.org) with native support for Dart through
   the Dart VM). One of the **simplest** ways to get both is to install the **Dart Editor bundle**,
   which includes the editor, SDK and Dartium. See the [Dart tools](https://www.dartlang.org/tools)
-  download [page for instructions](https://www.dartlang.org/tools/download.html). You can also
-  download both **stable** and **dev** channel versions from the [download
-  archive](https://www.dartlang.org/tools/download-archive).
+  download [page for instructions](https://www.dartlang.org/tools/download.html).  
+  You can also download both **stable** and **dev** channel versions from the [download
+  archive](https://www.dartlang.org/tools/download-archive). In that case, on Windows, Dart must be added
+  to the `Path` (e.g. `path-to-dart-sdk-folder\bin`) and a new `DARTIUM_BIN` environment variable must be
+  created, pointing to the executable (e.g. `path-to-dartium-folder\chrome.exe).`
 
 * [Git](http://git-scm.com) and/or the **GitHub app** (for [Mac](http://mac.github.com) or
   [Windows](http://windows.github.com)); [GitHub's Guide to Installing
   Git](https://help.github.com/articles/set-up-git) is a good source of information.
 
-* [Node.js](http://nodejs.org), (version `>=0.12.0 <0.13.0`) which is used to run a development web server, 
+* [Node.js](http://nodejs.org), (version `>=4.1.1 <5`) which is used to run a development web server, 
   run tests, and generate distributable files. We also use Node's Package Manager, `npm` 
-  (version `>=2.0 <3.0`), which comes with Node. Depending on your system, you can install Node either from 
+  (version `>=2.14.5 <3.0`), which comes with Node. Depending on your system, you can install Node either from 
   source or as a pre-packaged bundle.
 
 * [Chrome Canary](https://www.google.com/chrome/browser/canary.html), a version of Chrome with
@@ -255,7 +257,22 @@ to some whitespace difference.
     - Working directory: `$ProjectFileDir$`
 * `clang-format` integrations are also available for many popular editors (`vim`, `emacs`,
   `Sublime Text`, etc.).
+
+## Generating the API documentation
 
+The following gulp task will generate the API docs in the `dist/angular.io/partials/api/angular2`:  
+
+```shell
+$(npm bin)/gulp docs/angular.io
+```
+
+You can serve the generated documentation to check how it would render on [angular.io](https://angular.io/):
+- check out the [angular.io repo](https://github.com/angular/angular.io) locally,
+- install dependencies as described in the [angular.io README](https://github.com/angular/angular.io/blob/master/README.md),
+- copy the generated documentation from your local angular repo at `angular/dist/angular.io/partials/api/angular2` to your local angular.io repo at `angular.io/public/docs/js/latest/api`,
+- run `harp compile` at the root of the angular.io repo to check the generated documentation for errors,
+- run `harp server` and open a browser at `http://localhost:9000/docs/js/latest/api/` to check the rendered documentation. 
+
 ## Project Information
 
 ### Folder structure

diff --git a/NAMING.md b/NAMING.md
@@ -0,0 +1,32 @@
+Naming Conventions in Angular2
+---
+
+In general Angular2 should follow TypeScript naming conventions.
+See: https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines
+
+
+Classes:
+  - Example: `Compiler`, `ApplicationMetadata`
+  - Camel case with first letter upper-case
+  - In general prefer single words. (This is so that when appending `Proto` or `Factory` the class 
+    is still reasonable to work with.)
+  - Should not end with `Impl` or any other word which describes a specific implementation of an 
+    interface.
+
+
+Interfaces:
+  - Follow the same rules as Classes 
+  - Should not have `I` or `Interface` in the name or any other way of identifying it as an interface.
+
+
+Methods and functions:
+  - Example: `bootstrap`, `someMethod`
+  - Should be camel case with first lower case
+
+
+Constants
+  - Example: `CORE_DIRECTIVES`
+  - Should be all uppercase with SNAKE_CASE
+
+
+
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 [![Issue Stats](http://issuestats.com/github/angular/angular/badge/issue)](http://issuestats.com/github/angular/angular)
 [![npm version](https://badge.fury.io/js/angular2.svg)](http://badge.fury.io/js/angular2)
 [![Downloads](http://img.shields.io/npm/dm/angular2.svg)](https://npmjs.org/package/angular2)
+[![Sauce Test Status](https://saucelabs.com/browser-matrix/angular2-ci.svg)](https://saucelabs.com/u/angular2-ci)
 
 Angular 
 =========
@@ -35,7 +36,7 @@ guidelines for [contributing][contributing] and then check out one of our issues
 [contributing]: http://github.com/angular/angular/blob/master/CONTRIBUTING.md
 [dart]: http://www.dartlang.org
 [dartium]: http://www.dartlang.org/tools/dartium
-[download]: http://angular.io/download
+[download]: http://angular.io/download/
 [quickstart]: https://angular.io/docs/js/latest/quickstart.html
 [ng2]: http://angular.io
 [ngDart]: http://angulardart.org

diff --git a/TOOLS.md b/TOOLS.md
@@ -0,0 +1,4 @@
+# Developer Tools for Angular 2
+
+- [JavaScript](TOOLS_JS.md)
+- [Dart](TOOLS_DART.md)