Merge branch 'master' into dev-eromano-8783

Author: eromano

.appveyor.yml

@@ -1,6 +1,6 @@
 environment:
   matrix:
-    - nodejs_version: "6"
+    - nodejs_version: "8"
 
 matrix:
   fast_finish: true
@@ -15,7 +15,7 @@ test_script:
   - npm --version
   - npm run test:packages
   - npm run test:cli
-  - node tests\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate}/**"
+  - node tests\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles}/**"
 
 build: off
 

.circleci/config.yml

@@ -48,7 +48,7 @@ jobs:
           <<: *restore_cache_defaults
       - run: npm run test
 
-# E2E test for current Angular.
+  # E2E test for current Angular.
   e2e-setup:
     <<: *defaults
     steps:
@@ -110,67 +110,14 @@ jobs:
       - run: cp -r /workspace/dist/ ./
       - run: xvfb-run -a node tests/run_e2e.js --nobuild --reuse=/workspace/angular-cli-e2e-default/test-project --nb-shards=4 --shard=3 --nosilent
 
-# E2E test for Angular nightly.
-  e2e-setup-nightly:
+  # Master only E2E.
+  nightly-e2e:
     <<: *defaults
     steps:
       - checkout
       - restore_cache:
           <<: *restore_cache_defaults
-      - run: mkdir /workspace
-      - run: mkdir /workspace/angular-cli-e2e-nightly
-      # Ignore all tests, we just want the setup step to persist it to the workspace.
-      - run: node tests/run_e2e.js --tmpdir=/workspace/angular-cli-e2e-nightly --ignore=**/* --nightly
-      - run: mv dist /workspace/
-      - persist_to_workspace:
-          root: /workspace
-          paths:
-            - dist/
-            - angular-cli-e2e-nightly/
-
-  e2e-0-nightly:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          <<: *restore_cache_defaults
-      - attach_workspace:
-          <<: *attach_workspace_defaults
-      - run: cp -r /workspace/dist/ ./
-      - run: xvfb-run -a node tests/run_e2e.js --nobuild --reuse=/workspace/angular-cli-e2e-nightly/test-project --nb-shards=4 --shard=0 --nosilent --nightly
-
-  e2e-1-nightly:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          <<: *restore_cache_defaults
-      - attach_workspace:
-          <<: *attach_workspace_defaults
-      - run: cp -r /workspace/dist/ ./
-      - run: xvfb-run -a node tests/run_e2e.js --nobuild --reuse=/workspace/angular-cli-e2e-nightly/test-project --nb-shards=4 --shard=1 --nosilent --nightly
-
-  e2e-2-nightly:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          <<: *restore_cache_defaults
-      - attach_workspace:
-          <<: *attach_workspace_defaults
-      - run: cp -r /workspace/dist/ ./
-      - run: xvfb-run -a node tests/run_e2e.js --nobuild --reuse=/workspace/angular-cli-e2e-nightly/test-project --nb-shards=4 --shard=2 --nosilent --nightly
-
-  e2e-3-nightly:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          <<: *restore_cache_defaults
-      - attach_workspace:
-          <<: *attach_workspace_defaults
-      - run: cp -r /workspace/dist/ ./
-      - run: xvfb-run -a node tests/run_e2e.js --nobuild --reuse=/workspace/angular-cli-e2e-nightly/test-project --nb-shards=4 --shard=3 --nosilent --nightly
+      - run: xvfb-run -a node tests/run_e2e.js --nightly "--glob=tests/build/**"
 
 workflows:
   version: 2
@@ -199,23 +146,11 @@ workflows:
       - e2e-3:
           requires:
             - e2e-setup
-      # E2E test for Angular nightly.
-      - e2e-setup-nightly:
+      # Master only E2E.
+      - nightly-e2e:
           requires:
             - build
           filters:
             branches:
               only:
                 - master
-      - e2e-0-nightly:
-          requires:
-            - e2e-setup-nightly
-      - e2e-1-nightly:
-          requires:
-            - e2e-setup-nightly
-      - e2e-2-nightly:
-          requires:
-            - e2e-setup-nightly
-      - e2e-3-nightly:
-          requires:
-            - e2e-setup-nightly

.nvmrc

@@ -1 +1 @@
-6
+8

.travis.yml

@@ -21,9 +21,7 @@ matrix:
   fast_finish: true
   allow_failures:
     - env: nightly
-    - env: ng2
-    - node_js: "7"
-    - node_js: "8"
+    - env: node9
   include:
     # Build stage
     - stage: build
@@ -36,49 +34,38 @@ matrix:
     - stage: test
       script: npm run test
       env: test
-    - node_js: "6"
+    - node_js: "8"
       os: linux
       script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent
       env: e2e-0
-    - node_js: "6"
+    - node_js: "8"
       os: linux
       script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent
       env: e2e-1
-    - node_js: "6"
+    - node_js: "8"
       os: linux
       script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent
       env: e2e-2
-    - node_js: "6"
+    - node_js: "8"
       os: linux
       script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent
       env: e2e-3
-    - node_js: "6"
-      os: linux
-      script: node tests/run_e2e.js --eject "--glob=tests/build/**"
-      env: eject
+    # 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
 
     # Optional stage.
     - stage: optional
-      node_js: "6"
-      os: linux
-      script: node tests/run_e2e.js --ng2 "--glob=tests/build/**"
-      env: ng2
-    - node_js: "6"
-      os: linux
-      script: node tests/run_e2e.js --ng4 "--glob=tests/build/**"
-      env: ng4
-    - node_js: "6"
+      node_js: "8"
       os: linux
       script: node tests/run_e2e.js --nightly "--glob=tests/build/**"
       env: nightly
-    - node_js: "7"
-      os: linux
-      script: node tests/run_e2e.js "--glob=tests/build/**"
-      env: node7
-    - node_js: "8"
+    - node_js: "9"
       os: linux
       script: node tests/run_e2e.js "--glob=tests/build/**"
-      env: node8
+      env: node9
 
     # Deploy stage
     - stage: deploy
@@ -102,7 +89,7 @@ matrix:
 
 before_install:
   # Install npm 5.
-  - npm install -g npm@~5.3.0
+  - npm install -g npm@~5.6.0
 
 install:
   - npm install

README.md

@@ -3,7 +3,7 @@
 
 <!-- Badges section here. -->
 [![Build Status](https://img.shields.io/travis/angular/angular-cli/master.svg?label=travis)][travis-badge-url]
-[![CircleCI branch](https://img.shields.io/circleci/project/github/RedSparr0w/node-csgo-parser/master.svg?label=circleci)](https://circleci.com/gh/angular/angular-cli)
+[![CircleCI branch](https://img.shields.io/circleci/project/github/angular/angular-cli/master.svg?label=circleci)](https://circleci.com/gh/angular/angular-cli)
 [![Dependency Status][david-badge]][david-badge-url]
 [![devDependency Status][david-dev-badge]][david-dev-badge-url]
 
@@ -84,7 +84,7 @@ ng g component my-new-component # using the alias
 ng g component new-cmp
 # your component will be generated in src/app/feature/new-cmp
 # but if you were to run
-ng g component ../newer-cmp
+ng g component ./newer-cmp
 # your component will be generated in src/app/newer-cmp
 # if in the directory src/app you can also run
 ng g component feature/new-cmp
@@ -127,8 +127,8 @@ To update Angular CLI to a new version, you must update both the global package
 Global package:
 ```bash
 npm uninstall -g @angular/cli
-npm cache clean
-# if npm version is > 5 then use `npm cache verify` to avoid errors (or to avoid using --force)
+npm cache verify
+# if npm version is < 5 then use `npm cache clean`
 npm install -g @angular/cli@latest
 ```
 

docs/design/deployurl-basehref.md

@@ -0,0 +1,18 @@
+| | Deploy URL | Base HREF |
+|--|:--:|:--:|
+| Initial scripts (index.html) | ✅ 👍 | ✅ 👍  |
+| Initial stylesheets (index.html) | ✅ 👍  | ✅ 👍  |
+| Lazy scripts (routes/import()/etc.) | ✅ 👍  | ✅ 👍  |
+| Processed CSS resources (images/fonts/etc.) | ✅ 👍  | ✅ 👍 |
+| Relative template (HTML) assets | ❌ 👎 | ✅ 👍  |
+| Angular Router Default Base (APP_BASE_HREF) | ❌ | ✅ *1 |
+| Single reference in deployed Application | ❌ 👎  | ✅ 👍 |
+| Special resource logic within CLI | ✅ 👎 | ❌ 👍 |
+| Relative fetch/XMLHttpRequest | ❌ | ✅ |
+
+✅ - has/affects the item/trait
+❌ - does not have/affect the item/trait
+👍 - favorable behavior
+👎 - unfavorable behavior
+
+*1 -- Users with more complicated setups may need to manually configure the `APP_BASE_HREF` token within the application.  (e.g., application routing base is `/` but assets/scripts/etc. are at `/assets/`)

docs/documentation/build.md

@@ -118,6 +118,16 @@ Remember to disable the service worker while developing to avoid stale code.
 
 Note: service worker support is experimental and subject to change.
 
+### ES2015 support
+
+To build in ES2015 mode, edit `./tsconfig.json` to use `"target": "es2015"` (instead of `es5`).
+
+This will cause application TypeScript and Uglify be output as ES2015, and third party libraries
+to be loaded through the `es2015` entry in `package.json` if available.
+
+Be aware that JIT does not support ES2015 and so you should build/serve your app with `--aot`.
+See https://github.com/angular/angular-cli/issues/7797 for details.
+
 ## Options
 <details>
   <summary>aot</summary>

docs/documentation/e2e.md

@@ -60,6 +60,16 @@ Please note that options that are supported by `ng serve` are also supported by
   </p>
 </details>
 
+<details>
+  <summary>suite</summary>
+  <p>
+    <code>--suite</code> (aliases: <code>-su</code>)
+  </p>
+  <p>
+    Override suite in the protractor config. Can send in multiple suite by comma separated values (<code>ng e2e --suite=suiteA,suiteB</code>).
+  </p>
+</details>
+
 <details>
   <summary>webdriver-update</summary>
   <p>

docs/documentation/generate.md

@@ -23,39 +23,26 @@
     <code>--dry-run</code> (aliases: <code>-d</code>) <em>default value: false</em>
   </p>
   <p>
-     Run through without making any changes. Will list all files that would have been created when running <code>ng generate</code>.
+    Run through without making any changes.
   </p>
 </details>
 
 <details>
-  <summary>lint-fix</summary>
+  <summary>force</summary>
   <p>
-    <code>--lint-fix</code> (aliases: <code>-lf</code>)
+    <code>--force</code> (aliases: <code>-f</code>) <em>default value: false</em>
   </p>
   <p>
-    Use lint to fix files after generation.
-  </p>
-  <p>
-    You can also set default true to use lint every time after generation. To do this, change the value in <em>.angular-cli.json</em> (<code>defaults.lintFix</code>).
-  </p>
-</details>
-
-<details>
-  <summary>verbose</summary>
-  <p>
-    <code>--verbose</code> (aliases: <code>-v</code>) <em>default value: false</em>
-  </p>
-  <p>
-    Adds more details to output logging.
+    Forces overwriting of files.
   </p>
 </details>
 
 <details>
-  <summary>collection</summary>
+  <summary>app</summary>
   <p>
-    <code>--collection</code> (aliases: <code>-c</code>) <em>default value: @schematics/angular</em>
+    <code>--app</code>
   </p>
   <p>
-    Schematics collection to use.
+    Specifies app name to use.
   </p>
 </details>

docs/documentation/generate/component.md

@@ -19,7 +19,7 @@
 <details>
   <summary>change-detection</summary>
   <p>
-    <code>--change-detection</code> (aliases: <code>-cd</code>)
+    <code>--change-detection</code> (aliases: <code>-c</code>)
   </p>
   <p>
     Specifies the change detection strategy.
@@ -49,7 +49,7 @@
 <details>
   <summary>inline-style</summary>
   <p>
-    <code>--inline-style</code> (aliases: <code>-is</code>) <em>default value: false</em>
+    <code>--inline-style</code> (aliases: <code>-s</code>) <em>default value: false</em>
   </p>
   <p>
     Specifies if the style will be in the ts file.
@@ -59,7 +59,7 @@
 <details>
   <summary>inline-template</summary>
   <p>
-    <code>--inline-template</code> (aliases: <code>-it</code>) <em>default value: false</em>
+    <code>--inline-template</code> (aliases: <code>-t</code>) <em>default value: false</em>
   </p>
   <p>
     Specifies if the template will be in the ts file.
@@ -109,7 +109,7 @@
 <details>
   <summary>view-encapsulation</summary>
   <p>
-    <code>--view-encapsulation</code> (aliases: <code>-ve</code>)
+    <code>--view-encapsulation</code> (aliases: <code>-v</code>)
   </p>
   <p>
     Specifies the view encapsulation strategy.

docs/documentation/home.md

@@ -54,6 +54,7 @@ End-to-end tests are run via [Protractor](https://angular.github.io/protractor/)
 * [ng doc](doc)
 * [ng eject](eject)
 * [ng xi18n](xi18n)
+* [ng update](update)
 
 ## Angular CLI Config Schema
 * [Config Schema](angular-cli)