Merge pull request #184 from angular/master

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.appveyor.yml

@@ -1,15 +1,14 @@
 environment:
-  # Note: if updating to Node 10, use at least 10.5.0 to include a fix for
-  # https://github.com/nodejs/node/issues/20297
-  nodejs_version: "8.9.2" # Same version as used in CircleCI.
+  nodejs_version: "10.9.0" # Same version as used in CircleCI.
 
 matrix:
   fast_finish: true
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - yarn install --frozen-lockfile
-  - npm run webdriver-update-appveyor
+  # --network-timeout is a workaround for https://github.com/yarnpkg/yarn/issues/6221
+  - yarn --frozen-lockfile --network-timeout=500000
+  - yarn webdriver-update-appveyor
 
 test_script:
   - node --version

.circleci/config.yml

@@ -1,19 +1,39 @@
-version: 2
+# Configuration file for https://circleci.com/gh/angular/angular-cli
+
+# Note: YAML anchors allow an object to be re-used, reducing duplication.
+# The ampersand declares an alias for an object, then later the `<<: *name`
+# syntax dereferences it.
+# See http://blog.daemonl.com/2016/02/yaml.html
+# To validate changes, use an online parser, eg.
+# http://yaml-online-parser.appspot.com/
+
+# Variables
 
-_defaults: &defaults
+## IMPORTANT
+# If you change the `docker_image` version, also change the `cache_key` suffix and the version of
+# `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
+var_1: &docker_image angular/ngcontainer:0.5.0
+var_2: &cache_key angular_devkit-{{ checksum "yarn.lock" }}-0.5.0
+var_3: &node_8_docker_image angular/ngcontainer:0.3.3
+
+# Settings common to each job
+anchor_1: &defaults
   working_directory: ~/ng
   docker:
-    - image: angular/ngcontainer:0.3.3
+    - image: *docker_image
 
-_post_checkout: &post_checkout
+# After checkout, rebase on top of master.
+# Similar to travis behavior, but not quite the same.
+# See https://discuss.circleci.com/t/1662
+anchor_2: &post_checkout
   post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
-
-_root_package_lock_key: &root_package_lock_key
-  key: angular_devkit-{{ checksum "yarn.lock" }}-0.3.3-2
-
-_attach_options: &attach_options
+anchor_3: &root_package_lock_key
+  key: *cache_key
+anchor_4: &attach_options
   at: .
 
+# Job definitions
+version: 2
 jobs:
   install:
     <<: *defaults
@@ -46,7 +66,7 @@ jobs:
     <<: *defaults
     steps:
       - attach_workspace: *attach_options
-      - run: npm run test -- --code-coverage --full
+      - run: npm run test -- --full
 
   test-large:
     <<: *defaults
@@ -55,7 +75,7 @@ jobs:
     steps:
       - attach_workspace: *attach_options
       - run: npm run webdriver-update-circleci
-      - run: npm run test-large -- --code-coverage --full --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+      - run: npm run test-large -- --full --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   e2e-cli:
     <<: *defaults
@@ -65,8 +85,34 @@ jobs:
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
-      - run: npm install --global npm@6
       - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+      - store_artifacts:
+          path: /tmp/dist
+          destination: cli/new-production
+  
+  e2e-node-8:
+    <<: *defaults
+    # Overwrite docker image to node 8.
+    docker:
+      - image: *node_8_docker_image    
+    environment:
+      BASH_ENV: ~/.profile
+    resource_class: xlarge
+    parallelism: 2
+    steps:
+      - attach_workspace: *attach_options
+      - run: npm install --global npm@6
+      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --glob=tests/basic/* --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+
+  e2e-cli-ng-snapshots:
+    <<: *defaults
+    environment:
+      BASH_ENV: ~/.profile
+    resource_class: xlarge
+    parallelism: 4
+    steps:
+      - attach_workspace: *attach_options
+      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
 
   build:
     <<: *defaults
@@ -76,11 +122,11 @@ jobs:
 
   build-bazel:
     <<: *defaults
-    resource_class: large
+    resource_class: xlarge
     steps:
       - attach_workspace: *attach_options
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - run: bazel build //packages/...
+      - run: bazel test //packages/...
 
   snapshot_publish:
     <<: *defaults
@@ -121,12 +167,10 @@ workflows:
             - install
       - build:
           requires:
-            - lint
-            - validate
+            - install
       - build-bazel:
           requires:
-            - lint
-            - validate
+            - build
       - test:
           requires:
             - build
@@ -136,6 +180,15 @@ workflows:
       - e2e-cli:
           requires:
             - build
+      - e2e-node-8:
+          requires:
+            - build
+      - e2e-cli-ng-snapshots:
+          requires:
+            - build
+          filters:
+            branches:
+              only: master
       - snapshot_publish:
           requires:
             - test
@@ -148,6 +201,7 @@ workflows:
           requires:
             - test
             - build
+            - e2e-cli
             - snapshot_publish
           filters:
             tags:

.github/angular-robot.yml

@@ -91,3 +91,8 @@ triage:
     -
       - "type: docs"
       - "comp: *"
+
+# Size checking
+size:
+  circleCiStatusName: "ci/circleci: e2e-cli"
+  maxSizeIncrease: 10000

.gitignore

@@ -2,6 +2,7 @@
 bazel-*
 test-project-host-*
 dist/
+dist-schema/
 
 # IDEs
 .idea/

.monorepo.json

@@ -42,12 +42,12 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.8.0-beta.3",
-      "hash": "2bee2bd5743e4b92e00d80e814e1e198"
+      "version": "0.9.0-beta.4",
+      "hash": "a9b1f213a4069f789d20021bda616775"
     },
     "devkit": {
-      "version": "0.8.0-beta.3",
-      "hash": "94d31601b627dd2057440ebcbb179648"
+      "version": "0.9.0-beta.4",
+      "hash": "30ac66398ef7b4f7a5dbd3192d24c665"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -58,15 +58,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "6.2.0-beta.3",
+      "version": "7.0.0-beta.4",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "fc82d4f599d099b690807f8283a18706"
+      "hash": "861fb8f47bfe7c42b61ba03c923e4c4f"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.8.0-beta.3",
-      "hash": "1ab8f8ad8cc8e574c69bd8c760652c87",
+      "version": "0.9.0-beta.4",
+      "hash": "5ce80a80caee296f31fd7973d1d1af7c",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -77,16 +77,22 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.8.0-beta.3",
-      "hash": "807337e245b9545cfe5f0a0dbcd17161",
+      "version": "0.9.0-beta.4",
+      "hash": "6b477a8c670ac1aaf8232517932026e9",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.8.0-beta.3",
-      "hash": "a9658d69f8757373fac1e24eff5136c9",
+      "version": "0.9.0-beta.4",
+      "hash": "0df3aa7f3bccb0a2390f7691ef610ba4",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
+    "@angular-devkit/benchmark": {
+      "name": "Benchmark",
+      "section": "Tooling",
+      "version": "1.0.0-beta.1",
+      "hash": "b413c32410c61f3d7096f40f60e69cc9"
+    },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
       "links": [
@@ -95,8 +101,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.8.0-beta.3",
-      "hash": "7b4759aed909a34015ff8c76fad8fb54",
+      "version": "0.9.0-beta.4",
+      "hash": "5f028763dff86aaebc80476e1f550d9f",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -107,8 +113,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.8.0-beta.3",
-      "hash": "ebf511eb9c2bee383e60a1dae597bb75",
+      "version": "0.9.0-beta.4",
+      "hash": "228c997459d1106b0b9bfcc2636fb838",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -119,8 +125,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.8.0-beta.3",
-      "hash": "5ae8fae2754dce793a6b20892a538705",
+      "version": "0.9.0-beta.4",
+      "hash": "4d12d45c630abe262a3844b0021801cf",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -131,9 +137,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.8.0-beta.3",
+      "version": "0.9.0-beta.4",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "c85c924aa07364e5756580ad318079dc"
+      "hash": "5887fbece28cf8e795cadf95b4518de1"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -143,8 +149,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "0.8.0-beta.3",
-      "hash": "4dcf0255e6f90ae4ead4509543ed50c1",
+      "version": "7.0.0-beta.4",
+      "hash": "7f4c330644a23e8f1383256c9593842f",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -155,43 +161,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "0.8.0-beta.3",
-      "hash": "7647010b5accf300ef4007c6cdfbe552",
+      "version": "7.0.0-beta.4",
+      "hash": "30b6fadcf785da5b8d911ab0dca30397",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.8.0-beta.3",
-      "hash": "0b11f6bf4244c4cc8d28e57935a27217",
+      "version": "0.9.0-beta.4",
+      "hash": "e143b8e611f5b5d5b24ee1a62bc638ef",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "6.2.0-beta.3",
+      "version": "7.0.0-beta.4",
       "section": "Misc",
-      "hash": "11e14f8112c8b0afdcedfe16625c2a98",
+      "hash": "213663b5fd23e27196cf83bef9f0f41c",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "0.8.0-beta.3",
-      "hash": "4f781c3f422b158a21f4e25a7c6a6985",
+      "version": "7.0.0-beta.4",
+      "hash": "963b148fe42112d53ba26cea010089e9",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.8.0-beta.3",
+      "version": "0.9.0-beta.4",
       "section": "Schematics",
-      "hash": "72700f5b3575719d8434afa134d29c49",
+      "hash": "a6726ae6664fb43c861e3bb4bb0ccb76",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.8.0-beta.3",
+      "version": "0.9.0-beta.4",
       "section": "Schematics",
-      "hash": "427bd269437ac368e65d9e8d70bfd8e6",
+      "hash": "5bbb5fd7ebaf18b452dee36521ab5142",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

.nvmrc

@@ -1 +1 @@
-8
+10