Merge pull request #138 from angular/master

Update upstream

Author: GulajavaMinistudio

.appveyor.yml

@@ -1,12 +1,13 @@
 environment:
   matrix:
-    - nodejs_version: "8"
+    - nodejs_version: "8.9"
 
 matrix:
   fast_finish: true
 
 install:
   - ps: Install-Product node $env:nodejs_version
+  - npm install -g [email protected]
   - npm install
   - choco install googlechrome
 

.travis.yml

@@ -52,14 +52,12 @@ matrix:
       env: e2e-3
     - node_js: "8"
       os: linux
-      script: node tests/run_e2e.js --ng-version="^5.0.0" "--glob=tests/{basic,build}/**"
-      env: ng5-subset
-
-    # WEBPACK4_DISABLED - eject temporarily disabled for webpack 4 integration
-    # - node_js: "8"
-    #   os: linux
-    #   script: node tests/run_e2e.js --eject "--glob=tests/build/**"
-    #   env: eject
+      script: node tests/run_e2e.js --ng-version="^5.0.0" "--glob=tests/{basic,build/styles,build/aot}/**"
+      env: ng5-subset-1
+    - node_js: "8"
+      os: linux
+      script: node tests/run_e2e.js --ng-version="^5.0.0" "--glob=tests/build/*"
+      env: ng5-subset-2
 
     # Optional stage.
     - stage: optional
@@ -71,6 +69,10 @@ matrix:
       os: linux
       script: node tests/run_e2e.js "--glob=tests/build/**"
       env: node9
+    - node_js: "10"
+      os: linux
+      script: node tests/run_e2e.js "--glob=tests/build/**"
+      env: node10
 
     # Deploy stage
     - stage: deploy
@@ -93,6 +95,7 @@ matrix:
 
 
 install:
+  - npm install -g [email protected]
   - npm install
 
 env: