Merge pull request #1 from angular/master

Update to latest code changes

Author: pk-karthik

.appveyor.yml

@@ -1,15 +1,19 @@
 environment:
   matrix:
-  - nodejs_version: "5.0"
-  - nodejs_version: "6.0"
+  - nodejs_version: "6.9"
+
+matrix:
+  fast_finish: true
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - npm install
+  - npm install -g yarn
+  - yarn install
 
 test_script:
   - node --version
-  - npm --version
-  - npm test
+  - yarn --version
+  - yarn test
+  - node tests\run_e2e.js
 
 build: off

.editorconfig

@@ -6,10 +6,9 @@ root = true
 charset = utf-8
 indent_style = space
 indent_size = 2
-end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.md]
 insert_final_newline = false
-trim_trailing_whitespace = false
+trim_trailing_whitespace = true

.eslintignore

@@ -1,8 +1,10 @@
-# /node_modules and /bower_components ignored by default
 dist/
 .git/
 tmp/
 typings/
 
 # Ignore all blueprint files. We e2e tests those later on.
-addon/ng2/blueprints/*/files/
+packages/@angular/cli/blueprints/*/files/
+
+# Ignore ember cli.
+packages/@angular/cli/ember-cli/

.eslintrc.json

@@ -8,7 +8,10 @@
     "node": true,
     "es6": true
   },
-  "parser": "espree",
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
   "rules": {
     "no-alert": "off",
     "no-array-constructor": "off",
@@ -161,7 +164,7 @@
     "guard-for-in": "off",
     "handle-callback-err": "off",
     "id-length": "off",
-    "indent": [2,2],
+    "indent": [2,2, { "SwitchCase": 1 }],
     "init-declarations": "off",
     "jsx-quotes": "off",
     "key-spacing": [2, {

.github/ISSUE_TEMPLATE.md

@@ -1,22 +1,23 @@
 > Please provide us with the following information:
 > ---------------------------------------------------------------
 
-1. OS?  Windows 7, 8 or 10. Linux (which distribution). Mac OSX (Yosemite? El Capitan?)
+### OS?
+> Windows 7, 8 or 10. Linux (which distribution). Mac OSX (Yosemite? El Capitan?)
 
 
-2. Versions. Please run `ng --version`. If there's nothing outputted, please run
-in a Terminal: `node --version` and paste the result here:
+### Versions.
+> Please run `ng --version`. If there's nothing outputted, please run in a Terminal: `node --version` and paste the result here:
 
 
-3. Repro steps. Was this an app that wasn't created using the CLI? What change did you
-   do on your code? etc.
+### Repro steps.
+> Was this an app that wasn't created using the CLI? What change did you do on your code? etc.
 
 
-4. The log given by the failure. Normally this include a stack trace and some
-   more information.
+### The log given by the failure.
+> Normally this include a stack trace and some more information.
 
 
-5. Mention any other details that might be useful.
+### Mention any other details that might be useful.
 
 > ---------------------------------------------------------------
 > Thanks! We'll be in touch soon.

.gitignore

@@ -1,6 +1,7 @@
 dist/
 node_modules/
 npm-debug.log*
+yarn-error.log*
 
 # IDEs
 .idea/

.nvmrc

@@ -1 +1 @@
-4
+6

.travis.yml

@@ -1,53 +1,59 @@
 dist: trusty
 sudo: required
+
 language: node_js
-node_js:
-  - "5"
-  - "6"
-os:
-  - linux
-  - osx
+
 env:
   global:
     - DBUS_SESSION_BUS_ADDRESS=/dev/null
-  matrix:
-    - SCRIPT=lint
-#    - SCRIPT=build
-    - SCRIPT=test
-#    - TARGET=mobile SCRIPT=mobile_test
+
 matrix:
   fast_finish: true
   allow_failures:
-    - os: osx
-  exclude:
+    - node_js: "7"
+    - env: NODE_SCRIPT="tests/run_e2e.js --nightly --ng4"
+  include:
     - node_js: "6"
-      env: SCRIPT=lint
-    - os: osx
-      node_js: "5"
+      os: linux
       env: SCRIPT=lint
     - node_js: "6"
+      os: linux
       env: SCRIPT=build
-    - os: osx
-      node_js: "5"
-      env: SCRIPT=build
-    - os: osx
-      env: TARGET=mobile SCRIPT=mobile_test
+    - node_js: "6"
+      os: linux
+      env: SCRIPT=test
+    - node_js: "6"
+      os: linux
+      env: NODE_SCRIPT="tests/run_e2e.js --glob=tests/build/**"
+    - node_js: "6"
+      os: linux
+      env: NODE_SCRIPT="tests/run_e2e.js --eject --glob=tests/build/**"
+    - node_js: "6"
+      os: linux
+      env: NODE_SCRIPT="tests/run_e2e.js --ignore=**/tests/build/**"
+    - node_js: "6"
+      os: linux
+      env: NODE_SCRIPT="tests/run_e2e.js --ng4 --glob=tests/build/**"
+    - node_js: "6"
+      os: linux
+      env: NODE_SCRIPT="tests/run_e2e.js --ng4 --ignore=**/tests/build/**"
+
+    # Optional builds.
+    - node_js: "6"
+      os: linux
+      env: NODE_SCRIPT="tests/run_e2e.js --nightly --ng4"
+    - node_js: "7"
+      os: linux
+      env: NODE_SCRIPT=tests/run_e2e.js
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap caskroom/cask; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install google-chrome --force; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir ~/.config && echo "--no-sandbox" > ~/.config/chrome-flags.conf; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CHROME_BIN=chromium-browser; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "--no-sandbox" > ~/.config/chromium-flags.conf; fi
-  - if [[ "$TARGET" == "mobile" ]]; then export MOBILE_TEST=true; fi
-  - npm config set spin false
-  - npm config set progress false
-
-install:
-  - npm install --no-optional
+  - yarn config set spin false
+  - yarn config set progress false
 
 script:
-  - npm run-script $SCRIPT
+  - if [[ "$SCRIPT" ]]; then npm run-script $SCRIPT; fi
+  - if [[ "$NODE_SCRIPT" ]]; then node $NODE_SCRIPT; fi