release: cut the v7.0.0-beta.7 release

PR Close #25363

.circleci/bazel.rc

@@ -20,18 +20,6 @@ build --announce_rc
 # We use this when uploading artifacts after the build finishes
 build --symlink_prefix=dist/
 
-# Enable experimental CircleCI bazel remote cache proxy
-# See remote cache documentation in /docs/BAZEL.md
-build --experimental_remote_spawn_cache --remote_rest_cache=http://localhost:7643
-
-# Prevent unstable environment variables from tainting cache keys
-build --experimental_strict_action_env
-
-# Save downloaded repositories such as the go toolchain
-# This directory can then be included in the CircleCI cache
-# It should save time running the first build
-build --experimental_repository_cache=/home/circleci/bazel_repository_cache
-
 # Workaround https://github.com/bazelbuild/bazel/issues/3645
 # Bazel doesn't calculate the memory ceiling correctly when running under Docker.
 # Limit Bazel to consuming resources that fit in CircleCI "xlarge" class
@@ -40,3 +28,6 @@ build --local_resources=14336,8.0,1.0
 
 # Retry in the event of flakes, eg. https://circleci.com/gh/angular/angular/31309
 test --flaky_test_attempts=2
+
+# More details on failures
+build --verbose_failures=true

.circleci/config.yml

@@ -26,6 +26,11 @@ var_4: &setup-bazel-remote-cache
     command: ~/bazel-remote-proxy -backend circleci://
     background: true
 
+var_5: &setup_bazel_remote_execution
+  run:
+    name: "Setup bazel RBE remote execution"
+    command: openssl aes-256-cbc -d -in .circleci/gcp_token -k "${CIRCLE_PROJECT_REPONAME}" -out /home/circleci/.gcp_credentials && echo "export GOOGLE_APPLICATION_CREDENTIALS=/home/circleci/.gcp_credentials" >> $BASH_ENV && sudo bash -c "cat .circleci/rbe-bazel.rc >> /etc/bazel.bazelrc"
+
 # Settings common to each job
 anchor_1: &job_defaults
   working_directory: ~/ng
@@ -42,19 +47,18 @@ version: 2
 jobs:
   lint:
     <<: *job_defaults
+    resource_class: xlarge
     steps:
       - checkout:
           <<: *post_checkout
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
 
       # Check BUILD.bazel formatting before we have a node_modules directory
       # Then we don't need any exclude pattern to avoid checking those files
-      - run: 'buildifier -mode=check $(find . -type f \( -name "*.bzl" -or -name BUILD.bazel -or -name BUILD \)) ||
+      - run: 'yarn buildifier -mode=check ||
               (echo "BUILD files not formatted. Please run ''yarn buildifier''" ; exit 1)'
       # Run the skylark linter to check our Bazel rules
-      # deprecated-api is disabled because we use actions.new_file(genfiles_dir)
-      # which has no replacement, see https://github.com/bazelbuild/bazel/issues/4858
-      - run: 'find . -type f -name "*.bzl" |
-              xargs java -jar /usr/local/bin/Skylint_deploy.jar --disable-checks=deprecated-api ||
+      - run: 'yarn skylint ||
               (echo -e "\n.bzl files have lint errors. Please run ''yarn skylint''"; exit 1)'
 
       - restore_cache:
@@ -70,22 +74,20 @@ jobs:
       - *define_env_vars
       - checkout:
           <<: *post_checkout
-      # See remote cache documentation in /docs/BAZEL.md
-      - run: .circleci/setup_cache.sh
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - *setup-bazel-remote-cache
 
-      - restore_cache:
-          key: *cache_key
-
-      - run: ls /home/circleci/bazel_repository_cache || true
       - run: bazel info release
       - run: bazel run @nodejs//:yarn
       # Use bazel query so that we explicitly ask for all buildable targets to be built as well
       # This avoids waiting for the slowest build target to finish before running the first test
       # See https://github.com/bazelbuild/bazel/issues/4257
       # NOTE: Angular developers should typically just bazel build //packages/... or bazel test //packages/...
-      - run: bazel query --output=label //... | xargs bazel test --build_tag_filters=-ivy-only --test_tag_filters=-manual,-ivy-only
+      # Setup remote execution and run RBE-compatible tests.
+      - *setup_bazel_remote_execution
+      - run: bazel query --output=label //... | xargs bazel test --build_tag_filters=-ivy-only --test_tag_filters=-manual,-ivy-only,-local
+      # Now run RBE incompatible tests locally.
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
+      - run: bazel query --output=label //... | xargs bazel test --build_tag_filters=-ivy-only,local --test_tag_filters=-manual,-ivy-only,local
 
       # CircleCI will allow us to go back and view/download these artifacts from past builds.
       # Also we can use a service like https://buildsize.org/ to automatically track binary size of these artifacts.
@@ -119,15 +121,10 @@ jobs:
       - *define_env_vars
       - checkout:
           <<: *post_checkout
-      # See remote cache documentation in /docs/BAZEL.md
-      - run: .circleci/setup_cache.sh
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - *setup-bazel-remote-cache
-
-      - restore_cache:
-          key: *cache_key
 
       - run: bazel run @yarn//:yarn
+      - *setup_bazel_remote_execution
       - run: bazel query --output=label //... | xargs bazel test --define=compile=jit --build_tag_filters=ivy-jit --test_tag_filters=-manual,ivy-jit
 
   test_ivy_aot:
@@ -137,15 +134,10 @@ jobs:
       - *define_env_vars
       - checkout:
           <<: *post_checkout
-      # See remote cache documentation in /docs/BAZEL.md
-      - run: .circleci/setup_cache.sh
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - *setup-bazel-remote-cache
-
-      - restore_cache:
-          key: *cache_key
 
       - run: bazel run @yarn//:yarn
+      - *setup_bazel_remote_execution
       - run: bazel query --output=label //... | xargs bazel test --define=compile=local --build_tag_filters=ivy-local --test_tag_filters=-manual,ivy-local
 
   # This job should only be run on PR builds, where `CIRCLE_PR_NUMBER` is defined.
@@ -166,21 +158,6 @@ jobs:
           # `AIO_ARTIFACT_PATH` in `aio/aio-builds-setup/Dockerfile`
           destination: aio/dist/aio-snapshot.tgz
 
-  # This job should only be run on PR builds, where `CIRCLE_PR_NUMBER` is defined.
-  test_aio_preview:
-    <<: *job_defaults
-    steps:
-      - checkout:
-          <<: *post_checkout
-      - restore_cache:
-          key: *cache_key
-      - run: yarn install --cwd aio --frozen-lockfile --non-interactive
-      - run:
-          name: Wait for preview and run tests
-          command: |
-            source "./scripts/ci/env.sh" print
-            xvfb-run --auto-servernum node aio/scripts/test-preview.js $CIRCLE_PR_NUMBER $CIRCLE_SHA1 $AIO_MIN_PWA_SCORE
-
   # This job exists only for backwards-compatibility with old scripts and tests
   # that rely on the pre-Bazel dist/packages-dist layout.
   # It duplicates some work with the job above: we build the bazel packages
@@ -195,12 +172,9 @@ jobs:
       - *define_env_vars
       - checkout:
           <<: *post_checkout
-      # See remote cache documentation in /docs/BAZEL.md
-      - run: .circleci/setup_cache.sh
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - *setup-bazel-remote-cache
-
       - run: bazel run @nodejs//:yarn
+      - *setup_bazel_remote_execution
       - run: scripts/build-packages-dist.sh
 
       # Save the npm packages from //packages/... for other workflow jobs to read
@@ -267,11 +241,7 @@ jobs:
           <<: *post_checkout
       - restore_cache:
           key: *cache_key
-      - run:
-          name: Run tests against the deployed apps
-          command: |
-            source "./scripts/ci/env.sh" print
-            xvfb-run --auto-servernum ./aio/scripts/test-production.sh $AIO_MIN_PWA_SCORE
+      - run: xvfb-run --auto-servernum ./aio/scripts/test-production.sh
 
 workflows:
   version: 2
@@ -287,9 +257,6 @@ workflows:
           filters:
             branches:
               only: /pull\/\d+/
-      - test_aio_preview:
-          requires:
-            - aio_preview
       - integration_test:
           requires:
             - build-packages-dist
@@ -321,4 +288,4 @@ workflows:
 
 notify:
   webhooks:
-    - url: https://ngbuilds.io/circle-build
+    - url: https://ngbuilds.io/circle-build

.circleci/rbe-bazel.rc

@@ -0,0 +1,77 @@
+# These options are enabled when running on CI with Remote Build Execution.
+
+################################################################
+# Toolchain related flags for remote build execution.          #
+################################################################
+# Remote Build Execution requires a strong hash function, such as SHA256.
+startup --host_jvm_args=-Dbazel.DigestFunction=SHA256
+
+# Depending on how many machines are in the remote execution instance, setting
+# this higher can make builds faster by allowing more jobs to run in parallel.
+# Setting it too high can result in jobs that timeout, however, while waiting
+# for a remote machine to execute them.
+build --jobs=150
+
+# Set several flags related to specifying the platform, toolchain and java
+# properties.
+# These flags are duplicated rather than imported from (for example)
+# %workspace%/configs/ubuntu16_04_clang/1.0/toolchain.bazelrc to make this
+# bazelrc a standalone file that can be copied more easily.
+# These flags should only be used as is for the rbe-ubuntu16-04 container
+# and need to be adapted to work with other toolchain containers.
+build --host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.0:jdk8
+build --javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.0:jdk8
+build --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/1.0/bazel_0.15.0/default:toolchain
+build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+# Platform flags:
+# The toolchain container used for execution is defined in the target indicated
+# by "extra_execution_platforms", "host_platform" and "platforms".
+# If you are using your own toolchain container, you need to create a platform
+# target with "constraint_values" that allow for the toolchain specified with
+# "extra_toolchains" to be selected (given constraints defined in
+# "exec_compatible_with").
+# More about platforms: https://docs.bazel.build/versions/master/platforms.html
+build --extra_toolchains=@bazel_toolchains//configs/ubuntu16_04_clang/1.0/bazel_0.15.0/cpp:cc-toolchain-clang-x86_64-default
+build --extra_execution_platforms=//tools:rbe_ubuntu1604-angular
+build --host_platform=//tools:rbe_ubuntu1604-angular
+build --platforms=//tools:rbe_ubuntu1604-angular
+
+# Set various strategies so that all actions execute remotely. Mixing remote
+# and local execution will lead to errors unless the toolchain and remote
+# machine exactly match the host machine.
+build --spawn_strategy=remote
+build --strategy=Javac=remote
+build --strategy=Closure=remote
+build --genrule_strategy=remote
+build --define=EXECUTOR=remote
+
+# Enable the remote cache so action results can be shared across machines,
+# developers, and workspaces.
+build --remote_cache=remotebuildexecution.googleapis.com
+
+# Enable remote execution so actions are performed on the remote systems.
+build --remote_executor=remotebuildexecution.googleapis.com
+
+# Remote instance.
+build --remote_instance_name=projects/internal-200822/instances/default_instance
+
+# Enable encryption.
+build --tls_enabled=true
+
+# Enforce stricter environment rules, which eliminates some non-hermetic
+# behavior and therefore improves both the remote cache hit rate and the
+# correctness and repeatability of the build.
+build --experimental_strict_action_env=true
+
+# Set a higher timeout value, just in case.
+build --remote_timeout=3600
+
+# Enable authentication. This will pick up application default credentials by
+# default. You can use --auth_credentials=some_file.json to use a service
+# account credential instead.
+build --auth_enabled=true
+
+# Do not accept remote cache.
+build --remote_accept_cached=false

.travis.yml

@@ -49,14 +49,12 @@ env:
     - CI_MODE=browserstack_optional
     - CI_MODE=aio_tools_test
     - CI_MODE=aio
-    - CI_MODE=aio_local
     - CI_MODE=aio_e2e AIO_SHARD=0
     - CI_MODE=aio_e2e AIO_SHARD=1
 
 matrix:
   fast_finish: true
   allow_failures:
-    - env: "CI_MODE=aio_local"
     - env: "CI_MODE=saucelabs_optional"
     - env: "CI_MODE=browserstack_optional"
 

CHANGELOG.md

@@ -1,11 +1,17 @@
-<a name="6.1.10"></a>
-## [6.1.10](https://github.com/angular/angular/compare/6.1.9...6.1.10) (2018-10-10)
+<a name="7.0.0-beta.7"></a>
+# [7.0.0-beta.7](https://github.com/angular/angular/compare/7.0.0-beta.6...7.0.0-beta.7) (2018-09-26)
 
 
 ### Bug Fixes
 
-* **platform-browser:** fix [#22155](https://github.com/angular/angular/issues/22155), destroy hammer manager when `HammerInstance.off()` is run ([#22156](https://github.com/angular/angular/issues/22156)) ([3b4d9dc](https://github.com/angular/angular/commit/3b4d9dc))
-* **upgrade:** properly destroy upgraded component elements and descendants ([#26209](https://github.com/angular/angular/issues/26209)) ([623adbb](https://github.com/angular/angular/commit/623adbb)), closes [#26208](https://github.com/angular/angular/issues/26208)
+* **core:** add missing `peerDependency ` to `[@angular](https://github.com/angular)/compiler` ([#26033](https://github.com/angular/angular/issues/26033)) ([549de1e](https://github.com/angular/angular/commit/549de1e)), closes [/github.com/angular/angular/commit/919f42fea1df4b9e38b7d688aef5f2de668e9d3e#diff-58563046c4439699f2e6a89187099a54](https://github.com//github.com/angular/angular/commit/919f42fea1df4b9e38b7d688aef5f2de668e9d3e/issues/diff-58563046c4439699f2e6a89187099a54)
+* **service-worker:** do not blow up when caches are unwritable ([#26042](https://github.com/angular/angular/issues/26042)) ([2bd767c](https://github.com/angular/angular/commit/2bd767c))
+
+
+### Features
+
+* **compiler-cli:** add support to extend `angularCompilerOptions` ([#22717](https://github.com/angular/angular/issues/22717)) ([d7e5bbf](https://github.com/angular/angular/commit/d7e5bbf)), closes [#22684](https://github.com/angular/angular/issues/22684)
+* **platform-server:** update domino to v2.1.0 ([#25564](https://github.com/angular/angular/issues/25564)) ([3fb0da2](https://github.com/angular/angular/commit/3fb0da2))
 
 
 
@@ -19,24 +25,57 @@
 
 
 
-<a name="6.1.8"></a>
-## [6.1.8](https://github.com/angular/angular/compare/6.1.7...6.1.8) (2018-09-19)
+<a name="7.0.0-beta.6"></a>
+# [7.0.0-beta.6](https://github.com/angular/angular/compare/7.0.0-beta.5...7.0.0-beta.6) (2018-09-19)
 
 
 ### Bug Fixes
 
-* **bazel:** allow compile_strategy to be (privately) imported ([#25080](https://github.com/angular/angular/issues/25080)) ([2d0e642](https://github.com/angular/angular/commit/2d0e642))
-* **bazel:** correct type concatenated to devmode_js ([#25467](https://github.com/angular/angular/issues/25467)) ([91dd160](https://github.com/angular/angular/commit/91dd160))
-* **bazel:** move bazel managed runtime deps for downstream usage ([#25690](https://github.com/angular/angular/issues/25690)) ([48d7f4e](https://github.com/angular/angular/commit/48d7f4e))
-* **bazel:** specify the package and lock files using the workspace ([#25694](https://github.com/angular/angular/issues/25694)) ([678b420](https://github.com/angular/angular/commit/678b420))
-* **compiler:** Fix look up of entryComponents in AOT Summaries ([#24892](https://github.com/angular/angular/issues/24892)) ([a31cfc5](https://github.com/angular/angular/commit/a31cfc5))
-* **router:** mount correct component if router outlet was not instantiated and if using a route reuse strategy ([#25313](https://github.com/angular/angular/issues/25313)) ([#25314](https://github.com/angular/angular/issues/25314)) ([e117b1f](https://github.com/angular/angular/commit/e117b1f))
+* **bazel:** specify the package and lock files using the workspace ([#25694](https://github.com/angular/angular/issues/25694)) ([ddc1335](https://github.com/angular/angular/commit/ddc1335))
+* **common:** register locale data for all equivalent closure locales ([#25867](https://github.com/angular/angular/issues/25867)) ([d83f9d4](https://github.com/angular/angular/commit/d83f9d4))
+* **compiler:** Fix look up of entryComponents in AOT Summaries ([#24892](https://github.com/angular/angular/issues/24892)) ([00d3666](https://github.com/angular/angular/commit/00d3666))
+* **ivy:** add [@nocollapse](https://github.com/nocollapse) when writing closure-annotated code ([#25775](https://github.com/angular/angular/issues/25775)) ([a0c4b2d](https://github.com/angular/angular/commit/a0c4b2d))
+* **ivy:** don't accidently read the inherited definition ([#25736](https://github.com/angular/angular/issues/25736)) ([d5bd86a](https://github.com/angular/angular/commit/d5bd86a)), closes [#24011](https://github.com/angular/angular/issues/24011) [#25026](https://github.com/angular/angular/issues/25026)
+* **ivy:** ensure Ivy *Ref classes derive from view engine equivalents ([#25775](https://github.com/angular/angular/issues/25775)) ([a9099e8](https://github.com/angular/angular/commit/a9099e8))
+* **ivy:** events should not mark views dirty by default ([#25969](https://github.com/angular/angular/issues/25969)) ([5653874](https://github.com/angular/angular/commit/5653874))
+* **ivy:** ngcc should compile entry-points in the correct order ([#25862](https://github.com/angular/angular/issues/25862)) ([9b1bb37](https://github.com/angular/angular/commit/9b1bb37))
+* **ivy:** use proper sanitizer names ([#25817](https://github.com/angular/angular/issues/25817)) ([21009b0](https://github.com/angular/angular/commit/21009b0)), closes [#25816](https://github.com/angular/angular/issues/25816)
+* **router:** mount correct component if router outlet was not instantiated and if using a route reuse strategy ([#25313](https://github.com/angular/angular/issues/25313)) ([#25314](https://github.com/angular/angular/issues/25314)) ([8dc2b11](https://github.com/angular/angular/commit/8dc2b11))
 
 
 ### Features
 
-* **bazel:** add additional parameters to `ts_api_guardian_test` def ([#25694](https://github.com/angular/angular/issues/25694)) ([97ae7ae](https://github.com/angular/angular/commit/97ae7ae))
-* **ivy:** enable .ngfactory.js generation in g3 only ([#25392](https://github.com/angular/angular/issues/25392)) ([1c44b71](https://github.com/angular/angular/commit/1c44b71))
+* **bazel:** add additional parameters to `ts_api_guardian_test` def ([#25694](https://github.com/angular/angular/issues/25694)) ([2a21ca0](https://github.com/angular/angular/commit/2a21ca0))
+* **ivy:** allow combined context discovery for components, directives and elements ([#25754](https://github.com/angular/angular/issues/25754)) ([62be8c2](https://github.com/angular/angular/commit/62be8c2))
+* **ivy:** patch animations into metadata ([#25828](https://github.com/angular/angular/issues/25828)) ([d2dfd48](https://github.com/angular/angular/commit/d2dfd48))
+* **ivy:** resolve references to vars in .d.ts files ([#25775](https://github.com/angular/angular/issues/25775)) ([96d6b79](https://github.com/angular/angular/commit/96d6b79))
+* **ivy:** support animation [@triggers](https://github.com/triggers) in templates ([#25849](https://github.com/angular/angular/issues/25849)) ([e363388](https://github.com/angular/angular/commit/e363388))
+* **ivy:** support bootstrap in ngModuleDef ([#25775](https://github.com/angular/angular/issues/25775)) ([13ccdfd](https://github.com/angular/angular/commit/13ccdfd))
+
+
+
+<a name="7.0.0-beta.5"></a>
+# [7.0.0-beta.5](https://github.com/angular/angular/compare/7.0.0-beta.4...7.0.0-beta.5) (2018-09-06)
+
+
+### Bug Fixes
+
+* **bazel:** protractor rule should include *.e2e-spec.js ([#25701](https://github.com/angular/angular/issues/25701)) ([3809e0f](https://github.com/angular/angular/commit/3809e0f))
+* **benchpress:** Use performance.mark() instead of console.time() ([#24114](https://github.com/angular/angular/issues/24114)) ([06d0400](https://github.com/angular/angular/commit/06d0400))
+* **compiler:** add hostVars and support pure functions in host bindings ([#25626](https://github.com/angular/angular/issues/25626)) ([b424b31](https://github.com/angular/angular/commit/b424b31))
+* **core:** do not clear element content when using shadow dom ([#24861](https://github.com/angular/angular/issues/24861)) ([6e828bb](https://github.com/angular/angular/commit/6e828bb))
+* **core:** size regression with closure compiler ([#25531](https://github.com/angular/angular/issues/25531)) ([1f59f2f](https://github.com/angular/angular/commit/1f59f2f))
+* **elements:** add compiler dependency ([#24861](https://github.com/angular/angular/issues/24861)) ([6143da6](https://github.com/angular/angular/commit/6143da6))
+* **elements:** add compiler to integration ([#24861](https://github.com/angular/angular/issues/24861)) ([a080ffc](https://github.com/angular/angular/commit/a080ffc))
+* **elements:** strict null checks ([#24861](https://github.com/angular/angular/issues/24861)) ([a8210d0](https://github.com/angular/angular/commit/a8210d0))
+* **upgrade:** trigger `$destroy` event on upgraded component element ([#25357](https://github.com/angular/angular/issues/25357)) ([2a672a9](https://github.com/angular/angular/commit/2a672a9)), closes [#25334](https://github.com/angular/angular/issues/25334)
+
+
+### Features
+
+* **elements:** enable Shadow DOM v1 and slots ([#24861](https://github.com/angular/angular/issues/24861)) ([c9844a2](https://github.com/angular/angular/commit/c9844a2))
+* **router:** warn if navigation triggered outside Angular zone ([#24959](https://github.com/angular/angular/issues/24959)) ([010e35d](https://github.com/angular/angular/commit/010e35d)), closes [#15770](https://github.com/angular/angular/issues/15770) [#15946](https://github.com/angular/angular/issues/15946) [#24728](https://github.com/angular/angular/issues/24728)
+
 
 
 
@@ -53,6 +92,18 @@
 * **router:** warn if navigation triggered outside Angular zone ([#24959](https://github.com/angular/angular/issues/24959)) ([23a96dc](https://github.com/angular/angular/commit/23a96dc)), closes [#15770](https://github.com/angular/angular/issues/15770) [#15946](https://github.com/angular/angular/issues/15946) [#24728](https://github.com/angular/angular/issues/24728)
 
 
+<a name="7.0.0-beta.4"></a>
+# [7.0.0-beta.4](https://github.com/angular/angular/compare/7.0.0-beta.3...7.0.0-beta.4) (2018-08-29)
+
+
+### Bug Fixes
+
+* **bazel:** Cache fileNameToModuleName lookups ([#25731](https://github.com/angular/angular/issues/25731)) ([f394ba0](https://github.com/angular/angular/commit/f394ba0))
+* **bazel:** move bazel managed runtime deps for downstream usage ([#25690](https://github.com/angular/angular/issues/25690)) ([6ed7993](https://github.com/angular/angular/commit/6ed7993))
+* **bazel:** only lookup amd module-name tags in .d.ts files ([#25710](https://github.com/angular/angular/issues/25710)) ([42072c4](https://github.com/angular/angular/commit/42072c4))
+* **compiler:** update compiler to generate new slot allocations ([#25607](https://github.com/angular/angular/issues/25607)) ([27e2039](https://github.com/angular/angular/commit/27e2039))
+
+
 
 <a name="6.1.6"></a>
 ## [6.1.6](https://github.com/angular/angular/compare/6.1.5...6.1.6) (2018-08-29)
@@ -66,6 +117,16 @@
 
 Note: the 6.1.5 release on npm accidentally glitched-out midway, so we cut 6.1.6 instead. sorry! :-)
 
+<a name="7.0.0-beta.3"></a>
+# [7.0.0-beta.3](https://github.com/angular/angular/compare/7.0.0-beta.2...7.0.0-beta.3) (2018-08-22)
+
+
+### Features
+
+* **router:** add UrlSegment[] to CanLoad interface ([#13127](https://github.com/angular/angular/issues/13127)) ([07d8d39](https://github.com/angular/angular/commit/07d8d39)), closes [#12411](https://github.com/angular/angular/issues/12411)
+
+
+
 <a name="6.1.4"></a>
 ## [6.1.4](https://github.com/angular/angular/compare/6.1.3...6.1.4) (2018-08-22)
 
@@ -76,6 +137,15 @@ Note: the 6.1.5 release on npm accidentally glitched-out midway, so we cut 6.1.6
 
 
 
+<a name="7.0.0-beta.2"></a>
+# [7.0.0-beta.2](https://github.com/angular/angular/compare/7.0.0-beta.1...7.0.0-beta.2) (2018-08-15)
+
+
+### Bug Fixes
+
+* **bazel:** correct type concatenated to devmode_js ([#25467](https://github.com/angular/angular/issues/25467)) ([fb2c524](https://github.com/angular/angular/commit/fb2c524))
+
+
 <a name="6.1.3"></a>
 ## [6.1.3](https://github.com/angular/angular/compare/6.1.2...6.1.3) (2018-08-15)
 
@@ -86,6 +156,24 @@ Note: the 6.1.5 release on npm accidentally glitched-out midway, so we cut 6.1.6
 
 
 
+<a name="7.0.0-beta.1"></a>
+# [7.0.0-beta.1](https://github.com/angular/angular/compare/7.0.0-beta.0...7.0.0-beta.1) (2018-08-08)
+
+
+### Bug Fixes
+
+* **compiler-cli:** use the oldProgram option in watch mode ([#21364](https://github.com/angular/angular/issues/21364)) ([c6e5b97](https://github.com/angular/angular/commit/c6e5b97)), closes [#21361](https://github.com/angular/angular/issues/21361)
+* **core:** In Testability.whenStable update callback, pass more complete ([#25010](https://github.com/angular/angular/issues/25010)) ([16c03c0](https://github.com/angular/angular/commit/16c03c0))
+* add mappings for ngfactory & ngsummary files to their module names in aot summary resolver ([#25335](https://github.com/angular/angular/issues/25335)) ([02e201a](https://github.com/angular/angular/commit/02e201a))
+* **router:** take base uri into account in `setUpLocationSync()` ([#20244](https://github.com/angular/angular/issues/20244)) ([ba1e25f](https://github.com/angular/angular/commit/ba1e25f)), closes [#20061](https://github.com/angular/angular/issues/20061)
+
+
+### Features
+
+* **core:** add DoBootstrap interface. ([#24558](https://github.com/angular/angular/issues/24558)) ([732026c](https://github.com/angular/angular/commit/732026c)), closes [#24557](https://github.com/angular/angular/issues/24557)
+
+
+
 <a name="6.1.2"></a>
 ## [6.1.2](https://github.com/angular/angular/compare/6.1.1...6.1.2) (2018-08-08)
 
@@ -96,13 +184,26 @@ Note: the 6.1.5 release on npm accidentally glitched-out midway, so we cut 6.1.6
 * add mappings for ngfactory & ngsummary files to their module names in aot summary resolver ([#25335](https://github.com/angular/angular/issues/25335)) ([054fbbe](https://github.com/angular/angular/commit/054fbbe))
 
 
+<a name="7.0.0-beta.0"></a>
+# [7.0.0-beta.0](https://github.com/angular/angular/compare/6.1.0...7.0.0-beta.0) (2018-08-02)
+
+### Bug Fixes
+
+* **bazel:** allow compile_strategy to be (privately) imported ([#25080](https://github.com/angular/angular/issues/25080)) ([0d1d589](https://github.com/angular/angular/commit/0d1d589))
+* **compiler:** update compiler to flatten nested template fns ([#24943](https://github.com/angular/angular/issues/24943)) ([fe14f18](https://github.com/angular/angular/commit/fe14f18))
+* **compiler-cli:** correct realPath to realpath. ([#25023](https://github.com/angular/angular/issues/25023)) ([01e6dab](https://github.com/angular/angular/commit/01e6dab))
+* **core:** throw error message when @Output not initialized ([#19116](https://github.com/angular/angular/issues/19116)) ([adf510f](https://github.com/angular/angular/commit/adf510f)), closes [#3664](https://github.com/angular/angular/issues/3664)
+
+
+### Features
+
+* **compiler:** add "original" placeholder value on extracted XMB ([#25079](https://github.com/angular/angular/issues/25079)) ([e99d860](https://github.com/angular/angular/commit/e99d860))
+
+
 
 <a name="6.1.1"></a>
 ## [6.1.1](https://github.com/angular/angular/compare/6.1.0...6.1.1) (2018-08-02)
 
-
-### Bug Fixes
-
 * **compiler-cli:** correct tsickle dependency version to fix typescript 2.9 compatibility ([fec29fa](https://github.com/angular/angular/commit/317c7087c56b72aa74cd6d6a8f719e6e7fec29fa))
 
 

CONTRIBUTING.md

@@ -71,8 +71,6 @@ Before you submit your Pull Request (PR) consider the following guidelines:
 
 1. Search [GitHub](https://github.com/angular/angular/pulls) for an open or closed PR
   that relates to your submission. You don't want to duplicate effort.
-1. Be sure that an issue describes the problem you're fixing, or documents the design for the feature you'd like to add.
-  Discussing the design up front helps to ensure that we're ready to accept your work.
 1. Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
   We cannot accept code without this. Make sure you sign with the primary email address of the Git identity that has been granted access to the Angular repository.
 1. Fork the angular/angular repo.

aio/aio-builds-setup/dockerbuild/cronjobs/aio-builds-cleanup

@@ -1,2 +1,2 @@
 # Periodically clean up builds that do not correspond to currently open PRs
-0 12 * * * /usr/local/bin/aio-clean-up >> /var/log/cron.log 2>&1
+0 12 * * * root /usr/local/bin/aio-clean-up >> /var/log/cron.log 2>&1

aio/aio-builds-setup/dockerbuild/nginx/aio-builds.conf

@@ -36,11 +36,6 @@ server {
   access_log {{$AIO_NGINX_LOGS_DIR}}/access.log;
   error_log  {{$AIO_NGINX_LOGS_DIR}}/error.log;
 
-  error_page 404 /404.html;
-  location "=/404.html" {
-    internal;
-  }
-
   location "~/[^/]+\.[^/]+$" {
     try_files $uri $uri/ =404;
   }
@@ -71,21 +66,6 @@ server {
     return 200 '';
   }
 
-  # Check PRs previewability
-  location "~^/can-have-public-preview/\d+/?$" {
-    if ($request_method != "GET") {
-      add_header Allow "GET";
-      return 405;
-    }
-
-    proxy_pass_request_headers on;
-    proxy_redirect             off;
-    proxy_method               GET;
-    proxy_pass                 http://{{$AIO_PREVIEW_SERVER_HOSTNAME}}:{{$AIO_PREVIEW_SERVER_PORT}}$request_uri;
-
-    resolver 127.0.0.1;
-  }
-
   # Notify about CircleCI builds
   location "~^/circle-build/?$" {
     if ($request_method != "POST") {

aio/aio-builds-setup/dockerbuild/scripts-js/lib/clean-up/build-cleaner.ts

@@ -5,12 +5,12 @@ import * as shell from 'shelljs';
 import {HIDDEN_DIR_PREFIX} from '../common/constants';
 import {GithubApi} from '../common/github-api';
 import {GithubPullRequests} from '../common/github-pull-requests';
-import {assertNotMissingOrEmpty, getPrInfoFromDownloadPath, Logger} from '../common/utils';
+import {assertNotMissingOrEmpty, createLogger, getPrInfoFromDownloadPath} from '../common/utils';
 
 // Classes
 export class BuildCleaner {
 
-  private logger = new Logger('BuildCleaner');
+  private logger = createLogger('BuildCleaner');
 
   // Constructor
   constructor(protected buildsDir: string, protected githubOrg: string, protected githubRepo: string,
@@ -122,6 +122,6 @@ export class BuildCleaner {
     this.logger.log(`Existing downloads: ${existingDownloads.length}`);
     this.logger.log(`Removing ${toRemove.length} download(s): ${toRemove.join(', ')}`);
 
-    toRemove.forEach(filePath => shell.rm(path.join(this.downloadsDir, filePath)));
+    toRemove.forEach(filePath => shell.rm(filePath));
   }
 }

aio/aio-builds-setup/dockerbuild/scripts-js/lib/common/circle-ci-api.ts

@@ -62,7 +62,7 @@ export class CircleCiApi {
       if (response.status !== 200) {
         throw new Error(`${baseUrl}: ${response.status} - ${response.statusText}`);
       }
-      return response.json();
+      return response.json<BuildInfo>();
     } catch (error) {
         throw new Error(`CircleCI build info request failed (${error.message})`);
     }
@@ -77,7 +77,7 @@ export class CircleCiApi {
     const baseUrl = `${CIRCLE_CI_API_URL}/${this.githubOrg}/${this.githubRepo}/${buildNumber}`;
     try {
       const response = await fetch(`${baseUrl}/artifacts?${this.tokenParam}`);
-      const artifacts = await response.json() as ArtifactResponse;
+      const artifacts = await response.json<ArtifactResponse>();
       const artifact = artifacts.find(item => item.path === artifactPath);
       if (!artifact) {
         throw new Error(`Missing artifact (${artifactPath}) for CircleCI build: ${buildNumber}`);

aio/aio-builds-setup/dockerbuild/scripts-js/lib/common/github-api.ts

@@ -38,8 +38,7 @@ export class GithubApi {
     return this.request<T>('post', path, data);
   }
 
-  // In GitHub API paginated requests, page numbering is 1-based. (https://developer.github.com/v3/#pagination)
-  public getPaginated<T>(pathname: string, baseParams: RequestParams = {}, currentPage: number = 1): Promise<T[]> {
+  public getPaginated<T>(pathname: string, baseParams: RequestParams = {}, currentPage: number = 0): Promise<T[]> {
     const perPage = 100;
     const params = {
       ...baseParams,

aio/aio-builds-setup/dockerbuild/scripts-js/lib/common/github-pull-requests.ts

@@ -74,6 +74,6 @@ export class GithubPullRequests {
    */
   public fetchFiles(pr: number): Promise<FileInfo[]> {
     assert(pr > 0, `Invalid PR number: ${pr}`);
-    return this.api.getPaginated<FileInfo>(`/repos/${this.repoSlug}/pulls/${pr}/files`);
+    return this.api.get<FileInfo[]>(`/repos/${this.repoSlug}/pulls/${pr}/files`);
   }
 }

aio/aio-builds-setup/dockerbuild/scripts-js/lib/common/run-tests.ts

@@ -1,14 +1,14 @@
-// We can't use `import...from` here, because of the following mess:
-// - GitHub project `jasmine/jasmine` is `jasmine-core` on npm and its typings `@types/jasmine`.
-// - GitHub project `jasmine/jasmine-npm` is `jasmine` on npm and has no typings.
-//
-// Using `import...from 'jasmine'` here, would import from `@types/jasmine` (which refers to the
-// `jasmine-core` module and the `jasmine` module).
-import Jasmine = require('jasmine');
-import 'source-map-support/register';
-
-export const runTests = (specFiles: string[]) => {
+export const runTests = (specFiles: string[], helpers?: string[]) => {
+  // We can't use `import` here, because of the following mess:
+  // - GitHub project `jasmine/jasmine` is `jasmine-core` on npm and its typings `@types/jasmine`.
+  // - GitHub project `jasmine/jasmine-npm` is `jasmine` on npm and has no typings.
+  //
+  // Using `import...from 'jasmine'` here, would import from `@types/jasmine` (which refers to the
+  // `jasmine-core` module and the `jasmine` module).
+  // tslint:disable-next-line: no-var-requires variable-name
+  const Jasmine = require('jasmine');
   const config = {
+    helpers,
     random: true,
     spec_files: specFiles,
     stopSpecOnExpectationFailure: true,
@@ -16,7 +16,7 @@ export const runTests = (specFiles: string[]) => {
 
   process.on('unhandledRejection', (reason: any) => console.log('Unhandled rejection:', reason));
 
-  const runner = new Jasmine({});
+  const runner = new Jasmine();
   runner.loadConfig(config);
   runner.onComplete((passed: boolean) => process.exit(passed ? 0 : 1));
   runner.execute();

aio/aio-builds-setup/dockerbuild/scripts-js/lib/common/utils.ts

@@ -74,25 +74,12 @@ export const getEnvVar = (name: string, isOptional = false): string => {
   return value || '';
 };
 
-/**
- * A basic logger implementation.
- * Delegates to `console`, but prepends each message with the current date and specified scope (i.e caller).
- */
-export class Logger {
-  private padding = ' '.repeat(20 - this.scope.length);
-
-  /**
-   * Create a new `Logger` instance for the specified `scope`.
-   * @param scope The logger's scope (added to all messages).
-   */
-  constructor(private scope: string) {}
-
-  public error(...args: any[]) { this.callMethod('error', args); }
-  public info(...args: any[]) { this.callMethod('info', args); }
-  public log(...args: any[]) { this.callMethod('log', args); }
-  public warn(...args: any[]) { this.callMethod('warn', args); }
-
-  private callMethod(method: 'error' | 'info' | 'log' | 'warn', args: any[]) {
-    console[method](`[${new Date()}]`, `${this.scope}:${this.padding}`, ...args);
-  }
+export function createLogger(scope: string) {
+  const padding = ' '.repeat(20 - scope.length);
+  return {
+    error: (...args: any[]) => console.error(`[${new Date()}]`, `${scope}:${padding}`, ...args),
+    info: (...args: any[]) => console.info(`[${new Date()}]`, `${scope}:${padding}`, ...args),
+    log: (...args: any[]) => console.log(`[${new Date()}]`, `${scope}:${padding}`, ...args),
+    warn: (...args: any[]) => console.warn(`[${new Date()}]`, `${scope}:${padding}`, ...args),
+  };
 }

aio/aio-builds-setup/dockerbuild/scripts-js/lib/preview-server/build-creator.ts

@@ -5,14 +5,14 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as shell from 'shelljs';
 import {HIDDEN_DIR_PREFIX} from '../common/constants';
-import {assertNotMissingOrEmpty, computeShortSha, Logger} from '../common/utils';
+import {assertNotMissingOrEmpty, computeShortSha, createLogger} from '../common/utils';
 import {ChangedPrVisibilityEvent, CreatedBuildEvent} from './build-events';
 import {PreviewServerError} from './preview-error';
 
 // Classes
 export class BuildCreator extends EventEmitter {
 
-  private logger = new Logger('BuildCreator');
+  private logger = createLogger('BuildCreator');
 
   // Constructor
   constructor(protected buildsDir: string) {

aio/aio-builds-setup/dockerbuild/scripts-js/lib/preview-server/build-retriever.ts

@@ -4,7 +4,7 @@ import {dirname} from 'path';
 import {mkdir} from 'shelljs';
 import {promisify} from 'util';
 import {CircleCiApi} from '../common/circle-ci-api';
-import {assert, assertNotMissingOrEmpty, computeArtifactDownloadPath, Logger} from '../common/utils';
+import {assert, assertNotMissingOrEmpty, computeArtifactDownloadPath, createLogger} from '../common/utils';
 import {PreviewServerError} from './preview-error';
 
 export interface GithubInfo {
@@ -19,7 +19,7 @@ export interface GithubInfo {
  * A helper that can get information about builds and download build artifacts.
  */
 export class BuildRetriever {
-  private logger = new Logger('BuildRetriever');
+  private logger = createLogger('BuildRetriever');
   constructor(private api: CircleCiApi, private downloadSizeLimit: number, private downloadDir: string) {
     assert(downloadSizeLimit > 0, 'Invalid parameter "downloadSizeLimit" should be a number greater than 0.');
     assertNotMissingOrEmpty('downloadDir', downloadDir);
@@ -34,7 +34,7 @@ export class BuildRetriever {
     const buildInfo = await this.api.getBuildInfo(buildNum);
     const githubInfo: GithubInfo = {
       org: buildInfo.username,
-      pr: getPrFromBranch(buildInfo.branch),
+      pr: getPrfromBranch(buildInfo.branch),
       repo: buildInfo.reponame,
       sha: buildInfo.vcs_revision,
       success: !buildInfo.failed,
@@ -73,7 +73,7 @@ export class BuildRetriever {
   }
 }
 
-function getPrFromBranch(branch: string): number {
+function getPrfromBranch(branch: string): number {
   // CircleCI only exposes PR numbers via the `branch` field :-(
   const match = /^pull\/(\d+)$/.exec(branch);
   if (!match) {

aio/aio-builds-setup/dockerbuild/scripts-js/lib/preview-server/preview-server-factory.ts

@@ -2,12 +2,11 @@
 import * as bodyParser from 'body-parser';
 import * as express from 'express';
 import * as http from 'http';
-import {AddressInfo} from 'net';
 import {CircleCiApi} from '../common/circle-ci-api';
 import {GithubApi} from '../common/github-api';
 import {GithubPullRequests} from '../common/github-pull-requests';
 import {GithubTeams} from '../common/github-teams';
-import {assert, assertNotMissingOrEmpty, Logger} from '../common/utils';
+import {assert, assertNotMissingOrEmpty, createLogger} from '../common/utils';
 import {BuildCreator} from './build-creator';
 import {ChangedPrVisibilityEvent, CreatedBuildEvent} from './build-events';
 import {BuildRetriever} from './build-retriever';
@@ -32,7 +31,7 @@ export interface PreviewServerConfig {
   trustedPrLabel: string;
 }
 
-const logger = new Logger('PreviewServer');
+const logger = createLogger('PreviewServer');
 
 // Classes
 export class PreviewServerFactory {
@@ -53,7 +52,7 @@ export class PreviewServerFactory {
     const httpServer = http.createServer(middleware as any);
 
     httpServer.on('listening', () => {
-      const info = httpServer.address() as AddressInfo;
+      const info = httpServer.address();
       logger.info(`Up and running (and listening on ${info.address}:${info.port})...`);
     });
 
@@ -64,36 +63,10 @@ export class PreviewServerFactory {
                                  buildCreator: BuildCreator, cfg: PreviewServerConfig): express.Express {
     const middleware = express();
     const jsonParser = bodyParser.json();
-    const significantFilesRe = new RegExp(cfg.significantFilesPattern);
 
     // RESPOND TO IS-ALIVE PING
     middleware.get(/^\/health-check\/?$/, (_req, res) => res.sendStatus(200));
 
-    // RESPOND TO CAN-HAVE-PUBLIC-PREVIEW CHECK
-    const canHavePublicPreviewRe = /^\/can-have-public-preview\/(\d+)\/?$/;
-    middleware.get(canHavePublicPreviewRe, async (req, res) => {
-      try {
-        const pr = +canHavePublicPreviewRe.exec(req.url)![1];
-
-        if (!await buildVerifier.getSignificantFilesChanged(pr, significantFilesRe)) {
-          // Cannot have preview: PR did not touch relevant files: `aio/` or `packages/` (except for spec files).
-          res.send({canHavePublicPreview: false, reason: 'No significant files touched.'});
-          logger.log(`PR:${pr} - Cannot have a public preview, because it did not touch any significant files.`);
-        } else if (!await buildVerifier.getPrIsTrusted(pr)) {
-          // Cannot have preview: PR not automatically verifiable as "trusted".
-          res.send({canHavePublicPreview: false, reason: 'Not automatically verifiable as "trusted".'});
-          logger.log(`PR:${pr} - Cannot have a public preview, because not automatically verifiable as "trusted".`);
-        } else {
-          // Can have preview.
-          res.send({canHavePublicPreview: true, reason: null});
-          logger.log(`PR:${pr} - Can have a public preview.`);
-        }
-      } catch (err) {
-        logger.error('Previewability check error', err);
-        respondWithError(res, err);
-      }
-    });
-
     // CIRCLE_CI BUILD COMPLETE WEBHOOK
     middleware.post(/^\/circle-build\/?$/, jsonParser, async (req, res) => {
       try {
@@ -134,7 +107,7 @@ export class PreviewServerFactory {
           `Invalid webhook: expected "githubRepo" property to equal "${cfg.githubRepo}" but got "${repo}".`);
 
         // Do not deploy unless this PR has touched relevant files: `aio/` or `packages/` (except for spec files)
-        if (!await buildVerifier.getSignificantFilesChanged(pr, significantFilesRe)) {
+        if (!await buildVerifier.getSignificantFilesChanged(pr, new RegExp(cfg.significantFilesPattern))) {
           res.sendStatus(204);
           logger.log(`PR:${pr}, Build:${buildNum} - ` +
                      `Skipping preview processing because this PR did not touch any significant files.`);

aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/helper.ts

@@ -11,7 +11,7 @@ import {
   AIO_NGINX_PORT_HTTPS,
   AIO_WWW_USER,
 } from '../common/env-variables';
-import {computeShortSha, Logger} from '../common/utils';
+import {computeShortSha, createLogger} from '../common/utils';
 
 // Interfaces - Types
 export interface CmdResult { success: boolean; err: Error | null; stdout: string; stderr: string; }
@@ -31,7 +31,7 @@ class Helper {
     https: AIO_NGINX_PORT_HTTPS,
   };
 
-  private logger = new Logger('TestHelper');
+  private logger = createLogger('TestHelper');
 
   // Constructor
   constructor() {
@@ -105,7 +105,7 @@ class Helper {
     Object.keys(this.portPerScheme).forEach(scheme => suiteFactory(scheme, this.portPerScheme[scheme]));
   }
 
-  public verifyResponse(status: number | [number, string], regex: string | RegExp = /^/): VerifyCmdResultFn {
+  public verifyResponse(status: number | [number, string], regex = /^/): VerifyCmdResultFn {
     let statusCode: number;
     let statusText: string;
 
@@ -180,42 +180,26 @@ class Helper {
   }
 }
 
-interface DefaultCurlOptions {
-  defaultMethod?: CurlOptions['method'];
-  defaultOptions?: CurlOptions['options'];
-  defaultHeaders?: CurlOptions['headers'];
-  defaultData?: CurlOptions['data'];
-  defaultExtraPath?: CurlOptions['extraPath'];
-}
-
 interface CurlOptions {
   method?: string;
   options?: string;
-  headers?: string[];
   data?: any;
   url?: string;
   extraPath?: string;
 }
 
-export function makeCurl(baseUrl: string, {
-  defaultMethod = 'POST',
-  defaultOptions = '',
-  defaultHeaders = ['Content-Type: application/json'],
-  defaultData = {},
-  defaultExtraPath = '',
-}: DefaultCurlOptions = {}) {
+export function makeCurl(baseUrl: string) {
   return function curl({
-    method = defaultMethod,
-    options = defaultOptions,
-    headers = defaultHeaders,
-    data = defaultData,
+    method = 'POST',
+    options = '',
+    data = {},
     url = baseUrl,
-    extraPath = defaultExtraPath,
+    extraPath = '',
   }: CurlOptions) {
     const dataString = data ? JSON.stringify(data) : '';
     const cmd = `curl -iLX ${method} ` +
                 `${options} ` +
-                headers.map(header => `--header "${header}" `).join('') +
+                `--header "Content-Type: application/json" ` +
                 `--data '${dataString}' ` +
                 `${url}${extraPath}`;
     return helper.runCmd(cmd);

aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/mock-external-apis.ts

@@ -2,7 +2,7 @@
 import * as nock from 'nock';
 import * as tar from 'tar-stream';
 import {gzipSync} from 'zlib';
-import {getEnvVar, Logger} from '../common/utils';
+import {createLogger, getEnvVar} from '../common/utils';
 import {BuildNums, PrNums, SHA} from './constants';
 
 // We are using the `nock` library to fake responses from REST requests, when testing.
@@ -14,7 +14,7 @@ import {BuildNums, PrNums, SHA} from './constants';
 // below and return a suitable response. This is quite complicated to setup since the
 // response from, say, CircleCI will affect what request is made to, say, Github.
 
-const logger = new Logger('mock-external-apis');
+const logger = createLogger('NOCK');
 
 const log = (...args: any[]) => {
   // Filter out non-matching URL checks
@@ -76,7 +76,7 @@ const GITHUB_PULLS_URL = `/repos/${AIO_GITHUB_ORGANIZATION}/${AIO_GITHUB_REPO}/p
 const GITHUB_TEAMS_URL = `/orgs/${AIO_GITHUB_ORGANIZATION}/teams`;
 
 const getIssueUrl = (prNum: number) => `${GITHUB_ISSUES_URL}/${prNum}`;
-const getFilesUrl = (prNum: number, pageNum = 1) => `${GITHUB_PULLS_URL}/${prNum}/files?page=${pageNum}&per_page=100`;
+const getFilesUrl = (prNum: number) => `${GITHUB_PULLS_URL}/${prNum}/files`;
 const getCommentUrl = (prNum: number) => `${getIssueUrl(prNum)}/comments`;
 const getTeamMembershipUrl = (teamId: number, username: string) => `/teams/${teamId}/memberships/${username}`;
 
@@ -97,7 +97,7 @@ const githubApi = nock(GITHUB_API_HOST).log(log).persist().matchHeader('Authoriz
 //////////////////////////////
 
 // GENERAL responses
-githubApi.get(GITHUB_TEAMS_URL + '?page=1&per_page=100').reply(200, TEST_TEAM_INFO);
+githubApi.get(GITHUB_TEAMS_URL + '?page=0&per_page=100').reply(200, TEST_TEAM_INFO);
 githubApi.post(getCommentUrl(PrNums.TRUST_CHECK_ACTIVE_TRUSTED_USER)).reply(200);
 
 // BUILD_INFO errors

aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/nginx.e2e.ts

@@ -3,7 +3,6 @@ import * as path from 'path';
 import {rm} from 'shelljs';
 import {AIO_BUILDS_DIR, AIO_NGINX_HOSTNAME, AIO_NGINX_PORT_HTTP, AIO_NGINX_PORT_HTTPS} from '../common/env-variables';
 import {computeShortSha} from '../common/utils';
-import {PrNums} from './constants';
 import {helper as h} from './helper';
 import {customMatchers} from './jasmine-custom-matchers';
 
@@ -253,42 +252,6 @@ describe(`nginx`, () => {
     });
 
 
-    describe(`${host}/can-have-public-preview`, () => {
-      const baseUrl = `${scheme}://${host}/can-have-public-preview`;
-
-
-      it('should disallow non-GET requests', async () => {
-        await Promise.all([
-          h.runCmd(`curl -iLX POST ${baseUrl}/42`).then(h.verifyResponse([405, 'Not Allowed'])),
-          h.runCmd(`curl -iLX PUT ${baseUrl}/42`).then(h.verifyResponse([405, 'Not Allowed'])),
-          h.runCmd(`curl -iLX PATCH ${baseUrl}/42`).then(h.verifyResponse([405, 'Not Allowed'])),
-          h.runCmd(`curl -iLX DELETE ${baseUrl}/42`).then(h.verifyResponse([405, 'Not Allowed'])),
-        ]);
-      });
-
-
-      it('should pass requests through to the preview server', async () => {
-        await h.runCmd(`curl -iLX GET ${baseUrl}/${PrNums.CHANGED_FILES_ERROR}`).
-          then(h.verifyResponse(500, /CHANGED_FILES_ERROR/));
-      });
-
-
-      it('should respond with 404 for unknown paths', async () => {
-        const cmdPrefix = `curl -iLX GET ${baseUrl}`;
-
-        await Promise.all([
-          h.runCmd(`${cmdPrefix}/foo/42`).then(h.verifyResponse(404)),
-          h.runCmd(`${cmdPrefix}-foo/42`).then(h.verifyResponse(404)),
-          h.runCmd(`${cmdPrefix}nfoo/42`).then(h.verifyResponse(404)),
-          h.runCmd(`${cmdPrefix}/42/foo`).then(h.verifyResponse(404)),
-          h.runCmd(`${cmdPrefix}/f00`).then(h.verifyResponse(404)),
-          h.runCmd(`${cmdPrefix}/`).then(h.verifyResponse(404)),
-        ]);
-      });
-
-    });
-
-
     describe(`${host}/circle-build`, () => {
 
       it('should disallow non-POST requests', done => {
@@ -324,7 +287,6 @@ describe(`nginx`, () => {
           h.runCmd(`${cmdPrefix}/circle-build/42`).then(h.verifyResponse(404)),
         ]).then(done);
       });
-
     });
 
 

aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/preview-server.e2e.ts

@@ -18,92 +18,6 @@ describe('preview-server', () => {
   afterEach(() => h.cleanUp());
 
 
-  describe(`${host}/can-have-public-preview`, () => {
-    const curl = makeCurl(`${host}/can-have-public-preview`, {
-      defaultData: null,
-      defaultExtraPath: `/${PrNums.TRUST_CHECK_ACTIVE_TRUSTED_USER}`,
-      defaultHeaders: [],
-      defaultMethod: 'GET',
-    });
-
-
-    it('should disallow non-GET requests', async () => {
-      const bodyRegex = /^Unknown resource in request/;
-
-      await Promise.all([
-        curl({method: 'POST'}).then(h.verifyResponse(404, bodyRegex)),
-        curl({method: 'PUT'}).then(h.verifyResponse(404, bodyRegex)),
-        curl({method: 'PATCH'}).then(h.verifyResponse(404, bodyRegex)),
-        curl({method: 'DELETE'}).then(h.verifyResponse(404, bodyRegex)),
-      ]);
-    });
-
-
-    it('should respond with 404 for unknown paths', async () => {
-      const bodyRegex = /^Unknown resource in request/;
-
-      await Promise.all([
-        curl({extraPath: `/foo/${PrNums.TRUST_CHECK_ACTIVE_TRUSTED_USER}`}).then(h.verifyResponse(404, bodyRegex)),
-        curl({extraPath: `-foo/${PrNums.TRUST_CHECK_ACTIVE_TRUSTED_USER}`}).then(h.verifyResponse(404, bodyRegex)),
-        curl({extraPath: `nfoo/${PrNums.TRUST_CHECK_ACTIVE_TRUSTED_USER}`}).then(h.verifyResponse(404, bodyRegex)),
-        curl({extraPath: `/${PrNums.TRUST_CHECK_ACTIVE_TRUSTED_USER}/foo`}).then(h.verifyResponse(404, bodyRegex)),
-        curl({extraPath: '/f00'}).then(h.verifyResponse(404, bodyRegex)),
-        curl({extraPath: '/'}).then(h.verifyResponse(404, bodyRegex)),
-      ]);
-    });
-
-
-    it('should respond with 500 if checking for significant file changes fails', async () => {
-      await Promise.all([
-        curl({extraPath: `/${PrNums.CHANGED_FILES_404}`}).then(h.verifyResponse(500, /CHANGED_FILES_404/)),
-        curl({extraPath: `/${PrNums.CHANGED_FILES_ERROR}`}).then(h.verifyResponse(500, /CHANGED_FILES_ERROR/)),
-      ]);
-    });
-
-
-    it('should respond with 200 (false) if no significant files were touched', async () => {
-      const expectedResponse = JSON.stringify({
-        canHavePublicPreview: false,
-        reason: 'No significant files touched.',
-      });
-
-      await curl({extraPath: `/${PrNums.CHANGED_FILES_NONE}`}).then(h.verifyResponse(200, expectedResponse));
-    });
-
-
-    it('should respond with 500 if checking "trusted" status fails', async () => {
-      await curl({extraPath: `/${PrNums.TRUST_CHECK_ERROR}`}).then(h.verifyResponse(500, 'TRUST_CHECK_ERROR'));
-    });
-
-
-    it('should respond with 200 (false) if the PR is not automatically verifiable as "trusted"', async () => {
-      const expectedResponse = JSON.stringify({
-        canHavePublicPreview: false,
-        reason: 'Not automatically verifiable as \\"trusted\\".',
-      });
-
-      await Promise.all([
-        curl({extraPath: `/${PrNums.TRUST_CHECK_INACTIVE_TRUSTED_USER}`}).then(h.verifyResponse(200, expectedResponse)),
-        curl({extraPath: `/${PrNums.TRUST_CHECK_UNTRUSTED}`}).then(h.verifyResponse(200, expectedResponse)),
-      ]);
-    });
-
-
-    it('should respond with 200 (true) if the PR can have a public preview', async () => {
-      const expectedResponse = JSON.stringify({
-        canHavePublicPreview: true,
-        reason: null,
-      });
-
-      await Promise.all([
-        curl({extraPath: `/${PrNums.TRUST_CHECK_ACTIVE_TRUSTED_USER}`}).then(h.verifyResponse(200, expectedResponse)),
-        curl({extraPath: `/${PrNums.TRUST_CHECK_TRUSTED_LABEL}`}).then(h.verifyResponse(200, expectedResponse)),
-      ]);
-    });
-
-  });
-
-
   describe(`${host}/circle-build`, () => {
 
     const curl = makeCurl(`${host}/circle-build`);

aio/aio-builds-setup/dockerbuild/scripts-js/package.json

@@ -7,49 +7,43 @@
   "license": "MIT",
   "scripts": {
     "prebuild": "yarn clean-dist",
-    "build": "yarn ~~build",
-    "prebuild-watch": "yarn prebuild",
-    "build-watch": "yarn ~~build-watch",
+    "build": "tsc",
+    "build-watch": "yarn build --watch",
     "clean-dist": "node --eval \"require('shelljs').rm('-rf', 'dist')\"",
-    "predev": "yarn build || true",
-    "dev": "run-p ~~build-watch ~~test-watch",
+    "dev": "concurrently --kill-others --raw --success first \"yarn build-watch\" \"yarn test-watch\"",
     "lint": "tslint --project tsconfig.json",
-    "pretest": "yarn build",
-    "test": "yarn ~~test-only",
-    "pretest-watch": "yarn pretest",
-    "test-watch": "yarn ~~test-watch",
-    "~~build": "tsc",
-    "~~build-watch": "yarn ~~build --watch",
     "pre~~test-only": "yarn lint",
     "~~test-only": "node dist/test",
-    "~~test-watch": "nodemon --delay 1 --exec \"yarn ~~test-only\" --watch dist"
+    "pretest": "yarn build",
+    "test": "yarn ~~test-only",
+    "pretest-watch": "yarn build",
+    "test-watch": "nodemon --exec \"yarn ~~test-only\" --watch dist"
   },
   "dependencies": {
-    "body-parser": "^1.18.3",
+    "body-parser": "^1.18.2",
     "delete-empty": "^2.0.0",
-    "express": "^4.16.3",
-    "jasmine": "^3.2.0",
-    "nock": "^9.6.1",
-    "node-fetch": "^2.2.0",
-    "shelljs": "^0.8.2",
-    "source-map-support": "^0.5.9",
-    "tar-stream": "^1.6.1",
-    "tslib": "^1.9.3"
+    "express": "^4.15.4",
+    "jasmine": "^2.8.0",
+    "nock": "^9.2.5",
+    "node-fetch": "^2.1.2",
+    "shelljs": "^0.8.1",
+    "tar-stream": "^1.6.0",
+    "tslib": "^1.7.1"
   },
   "devDependencies": {
-    "@types/body-parser": "^1.17.0",
-    "@types/express": "^4.16.0",
-    "@types/jasmine": "^2.8.8",
-    "@types/nock": "^9.3.0",
-    "@types/node": "^10.9.2",
-    "@types/node-fetch": "^2.1.2",
+    "@types/body-parser": "^1.16.5",
+    "@types/express": "^4.0.37",
+    "@types/jasmine": "^2.6.0",
+    "@types/nock": "^9.1.3",
+    "@types/node": "^8.0.30",
+    "@types/node-fetch": "^1.6.8",
     "@types/shelljs": "^0.8.0",
-    "@types/supertest": "^2.0.5",
-    "nodemon": "^1.18.3",
-    "npm-run-all": "^4.1.5",
-    "supertest": "^3.1.0",
-    "tslint": "^5.11.0",
-    "tslint-jasmine-noSkipOrFocus": "^1.0.9",
-    "typescript": "^3.0.1"
+    "@types/supertest": "^2.0.3",
+    "concurrently": "^3.5.0",
+    "nodemon": "^1.12.1",
+    "supertest": "^3.0.0",
+    "tslint": "^5.7.0",
+    "tslint-jasmine-noSkipOrFocus": "^1.0.8",
+    "typescript": "^2.5.2"
   }
 }

aio/aio-builds-setup/dockerbuild/scripts-js/test/clean-up/build-cleaner.spec.ts

@@ -5,28 +5,25 @@ import * as shell from 'shelljs';
 import {BuildCleaner} from '../../lib/clean-up/build-cleaner';
 import {HIDDEN_DIR_PREFIX} from '../../lib/common/constants';
 import {GithubPullRequests} from '../../lib/common/github-pull-requests';
-import {Logger} from '../../lib/common/utils';
 
 const EXISTING_BUILDS = [10, 20, 30, 40];
 const EXISTING_DOWNLOADS = [
-  '10-ABCDEF0-build.zip',
-  '10-1234567-build.zip',
-  '20-ABCDEF0-build.zip',
-  '20-1234567-build.zip',
+  'downloads/10-ABCDEF0-build.zip',
+  'downloads/10-1234567-build.zip',
+  'downloads/20-ABCDEF0-build.zip',
+  'downloads/20-1234567-build.zip',
 ];
 const OPEN_PRS = [10, 40];
 const ANY_DATE = jasmine.any(String);
 
 // Tests
 describe('BuildCleaner', () => {
-  let loggerErrorSpy: jasmine.Spy;
-  let loggerLogSpy: jasmine.Spy;
   let cleaner: BuildCleaner;
 
   beforeEach(() => {
-    loggerErrorSpy = spyOn(Logger.prototype, 'error');
-    loggerLogSpy = spyOn(Logger.prototype, 'log');
-    cleaner = new BuildCleaner('/foo/bar', 'baz', 'qux', '12345', '/downloads', 'build.zip');
+    spyOn(console, 'error');
+    spyOn(console, 'log');
+    cleaner = new BuildCleaner('/foo/bar', 'baz', 'qux', '12345', 'downloads', 'build.zip');
   });
 
   describe('constructor()', () => {
@@ -54,13 +51,11 @@ describe('BuildCleaner', () => {
         toThrowError('Missing or empty required parameter \'githubToken\'!');
     });
 
-
     it('should throw if \'downloadsDir\' is empty', () => {
       expect(() => new BuildCleaner('/foo/bar', 'baz', 'qux', '12345', '', 'build.zip')).
         toThrowError('Missing or empty required parameter \'downloadsDir\'!');
     });
 
-
     it('should throw if \'artifactPath\' is empty', () => {
       expect(() => new BuildCleaner('/foo/bar', 'baz', 'qux', '12345', 'downloads', '')).
         toThrowError('Missing or empty required parameter \'artifactPath\'!');
@@ -90,12 +85,9 @@ describe('BuildCleaner', () => {
     });
 
 
-    it('should return a promise', async () => {
+    it('should return a promise', () => {
       const promise = cleaner.cleanUp();
       expect(promise).toEqual(jasmine.any(Promise));
-
-      // Do not complete the test and release the spies synchronously, to avoid running the actual implementations.
-      await promise;
     });
 
 
@@ -168,7 +160,6 @@ describe('BuildCleaner', () => {
       }
     });
 
-
     it('should reject if \'removeUnnecessaryDownloads()\' rejects', async () => {
       try {
         cleanerRemoveUnnecessaryDownloadsSpy.and.callFake(() => Promise.reject('Test'));
@@ -177,7 +168,6 @@ describe('BuildCleaner', () => {
         expect(err).toBe('Test');
       }
     });
-
   });
 
 
@@ -287,14 +277,11 @@ describe('BuildCleaner', () => {
       prDeferred.resolve([{id: 0, number: 1}, {id: 1, number: 2}, {id: 2, number: 3}]);
     });
 
-
     it('should log the number of open PRs', () => {
       promise.then(prNumbers => {
-        expect(loggerLogSpy).toHaveBeenCalledWith(
-          ANY_DATE, 'BuildCleaner:        ', `Open pull requests: ${prNumbers}`);
+        expect(console.log).toHaveBeenCalledWith(ANY_DATE, 'BuildCleaner:        ', `Open pull requests: ${prNumbers}`);
       });
     });
-
   });
 
 
@@ -314,9 +301,9 @@ describe('BuildCleaner', () => {
     });
 
 
-    it('should get the contents of the downloads directory', () => {
+    it('should get the contents of the builds directory', () => {
       expect(fsReaddirSpy).toHaveBeenCalled();
-      expect(fsReaddirSpy.calls.argsFor(0)[0]).toBe('/downloads');
+      expect(fsReaddirSpy.calls.argsFor(0)[0]).toBe('downloads');
     });
 
 
@@ -330,7 +317,7 @@ describe('BuildCleaner', () => {
     });
 
 
-    it('should resolve with the returned file names', done => {
+    it('should resolve with the returned files (as numbers)', done => {
       promise.then(result => {
         expect(result).toEqual(EXISTING_DOWNLOADS);
         done();
@@ -396,7 +383,8 @@ describe('BuildCleaner', () => {
 
       cleaner.removeDir('/foo/bar');
 
-      expect(loggerErrorSpy).toHaveBeenCalledWith('ERROR: Unable to remove \'/foo/bar\' due to:', 'Test');
+      expect(console.error).toHaveBeenCalledWith(
+        jasmine.any(String), 'BuildCleaner:        ', 'ERROR: Unable to remove \'/foo/bar\' due to:', 'Test');
     });
 
   });
@@ -413,8 +401,8 @@ describe('BuildCleaner', () => {
     it('should log the number of existing builds and builds to be removed', () => {
       cleaner.removeUnnecessaryBuilds([1, 2, 3], [3, 4, 5, 6]);
 
-      expect(loggerLogSpy).toHaveBeenCalledWith('Existing builds: 3');
-      expect(loggerLogSpy).toHaveBeenCalledWith('Removing 2 build(s): 1, 2');
+      expect(console.log).toHaveBeenCalledWith(ANY_DATE, 'BuildCleaner:        ', 'Existing builds: 3');
+      expect(console.log).toHaveBeenCalledWith(ANY_DATE, 'BuildCleaner:        ', 'Removing 2 build(s): 1, 2');
     });
 
 
@@ -466,36 +454,25 @@ describe('BuildCleaner', () => {
 
 
   describe('removeUnnecessaryDownloads()', () => {
-    let shellRmSpy: jasmine.Spy;
-
     beforeEach(() => {
-      shellRmSpy = spyOn(shell, 'rm');
-    });
-
-
-    it('should log the number of existing downloads and downloads to be removed', () => {
-      cleaner.removeUnnecessaryDownloads(EXISTING_DOWNLOADS, OPEN_PRS);
-
-      expect(loggerLogSpy).toHaveBeenCalledWith('Existing downloads: 4');
-      expect(loggerLogSpy).toHaveBeenCalledWith('Removing 2 download(s): 20-ABCDEF0-build.zip, 20-1234567-build.zip');
-    });
-
-
-    it('should construct full paths to directories (by prepending \'downloadsDir\')', () => {
-      cleaner.removeUnnecessaryDownloads(['dl-1', 'dl-2', 'dl-3'], []);
-
-      expect(shellRmSpy).toHaveBeenCalledWith(normalize('/downloads/dl-1'));
-      expect(shellRmSpy).toHaveBeenCalledWith(normalize('/downloads/dl-2'));
-      expect(shellRmSpy).toHaveBeenCalledWith(normalize('/downloads/dl-3'));
+      spyOn(shell, 'rm');
     });
 
 
     it('should remove the downloads that do not correspond to open PRs', () => {
       cleaner.removeUnnecessaryDownloads(EXISTING_DOWNLOADS, OPEN_PRS);
-      expect(shellRmSpy).toHaveBeenCalledTimes(2);
-      expect(shellRmSpy).toHaveBeenCalledWith(normalize('/downloads/20-ABCDEF0-build.zip'));
-      expect(shellRmSpy).toHaveBeenCalledWith(normalize('/downloads/20-1234567-build.zip'));
+      expect(shell.rm).toHaveBeenCalledTimes(2);
+      expect(shell.rm).toHaveBeenCalledWith('downloads/20-ABCDEF0-build.zip');
+      expect(shell.rm).toHaveBeenCalledWith('downloads/20-1234567-build.zip');
     });
 
+
+    it('should log the number of existing builds and builds to be removed', () => {
+      cleaner.removeUnnecessaryDownloads(EXISTING_DOWNLOADS, OPEN_PRS);
+
+      expect(console.log).toHaveBeenCalledWith(ANY_DATE, 'BuildCleaner:        ', 'Existing downloads: 4');
+      expect(console.log).toHaveBeenCalledWith(ANY_DATE, 'BuildCleaner:        ',
+        'Removing 2 download(s): downloads/20-ABCDEF0-build.zip, downloads/20-1234567-build.zip');
+    });
   });
 });

aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-api.spec.ts

@@ -126,8 +126,8 @@ describe('GithubApi', () => {
       (api as any).getPaginated('/foo/bar');
       (api as any).getPaginated('/foo/bar', {baz: 'qux'});
 
-      expect(api.get).toHaveBeenCalledWith('/foo/bar', {page: 1, per_page: 100});
-      expect(api.get).toHaveBeenCalledWith('/foo/bar', {baz: 'qux', page: 1, per_page: 100});
+      expect(api.get).toHaveBeenCalledWith('/foo/bar', {page: 0, per_page: 100});
+      expect(api.get).toHaveBeenCalledWith('/foo/bar', {baz: 'qux', page: 0, per_page: 100});
     });
 
 
@@ -162,9 +162,9 @@ describe('GithubApi', () => {
         const paramsForPage = (page: number) => ({baz: 'qux', page, per_page: 100});
 
         expect(apiGetSpy).toHaveBeenCalledTimes(3);
-        expect(apiGetSpy.calls.argsFor(0)).toEqual(['/foo/bar', paramsForPage(1)]);
-        expect(apiGetSpy.calls.argsFor(1)).toEqual(['/foo/bar', paramsForPage(2)]);
-        expect(apiGetSpy.calls.argsFor(2)).toEqual(['/foo/bar', paramsForPage(3)]);
+        expect(apiGetSpy.calls.argsFor(0)).toEqual(['/foo/bar', paramsForPage(0)]);
+        expect(apiGetSpy.calls.argsFor(1)).toEqual(['/foo/bar', paramsForPage(1)]);
+        expect(apiGetSpy.calls.argsFor(2)).toEqual(['/foo/bar', paramsForPage(2)]);
 
         expect(data).toEqual(allItems);
 

aio/aio-builds-setup/dockerbuild/scripts-js/test/common/github-pull-requests.spec.ts

@@ -4,13 +4,13 @@ import {GithubPullRequests} from '../../lib/common/github-pull-requests';
 
 // Tests
 describe('GithubPullRequests', () => {
+
   let githubApi: jasmine.SpyObj<GithubApi>;
 
   beforeEach(() => {
     githubApi = jasmine.createSpyObj('githubApi', ['post', 'get', 'getPaginated']);
   });
 
-
   describe('constructor()', () => {
 
     it('should throw if \'githubOrg\' is missing or empty', () => {
@@ -95,14 +95,16 @@ describe('GithubPullRequests', () => {
         done();
       });
     });
-
   });
 
 
   describe('fetchAll()', () => {
     let prs: GithubPullRequests;
 
-    beforeEach(() => prs = new GithubPullRequests(githubApi, 'foo', 'bar'));
+    beforeEach(() => {
+      prs = new GithubPullRequests(githubApi, 'foo', 'bar');
+      spyOn(console, 'log');
+    });
 
 
     it('should call \'getPaginated()\' with the correct pathname and params', () => {
@@ -129,10 +131,8 @@ describe('GithubPullRequests', () => {
       githubApi.getPaginated.and.returnValue('Test');
       expect(prs.fetchAll() as any).toBe('Test');
     });
-
   });
 
-
   describe('fetchFiles()', () => {
     let prs: GithubPullRequests;
 
@@ -141,21 +141,21 @@ describe('GithubPullRequests', () => {
     });
 
 
-    it('should make a paginated GET request to GitHub with the correct pathname', () => {
+    it('should make a GET request to GitHub with the correct pathname', () => {
       prs.fetchFiles(42);
-      expect(githubApi.getPaginated).toHaveBeenCalledWith('/repos/foo/bar/pulls/42/files');
+      expect(githubApi.get).toHaveBeenCalledWith('/repos/foo/bar/pulls/42/files');
     });
 
 
     it('should resolve with the data returned from GitHub', done => {
-      const expected: any = [{sha: 'ABCDE', filename: 'a/b/c'}, {sha: '12345', filename: 'x/y/z'}];
-      githubApi.getPaginated.and.callFake(() => Promise.resolve(expected));
-      prs.fetchFiles(42).then(data => {
+      const expected: any = [{ sha: 'ABCDE', filename: 'a/b/c'}, { sha: '12345', filename: 'x/y/z' }];
+      githubApi.get.and.callFake(() => Promise.resolve(expected));
+      prs.fetch(42).then(data => {
         expect(data).toEqual(expected);
         done();
       });
     });
-
   });
 
+
 });

aio/aio-builds-setup/dockerbuild/scripts-js/test/common/utils.spec.ts

@@ -1,5 +1,4 @@
 // Imports
-import {resolve as resolvePath} from 'path';
 import {
   assert,
   assertNotMissingOrEmpty,
@@ -7,7 +6,6 @@ import {
   computeShortSha,
   getEnvVar,
   getPrInfoFromDownloadPath,
-  Logger,
 } from '../../lib/common/utils';
 
 // Tests
@@ -21,7 +19,6 @@ describe('utils', () => {
     });
   });
 
-
   describe('assert', () => {
     it('should throw if passed a false value', () => {
       expect(() => assert(false, 'error message')).toThrowError('error message');
@@ -32,7 +29,6 @@ describe('utils', () => {
     });
   });
 
-
   describe('computeArtifactDownloadPath', () => {
     it('should compute an absolute path based on the artifact info provided', () => {
       const downloadDir = '/a/b/c';
@@ -40,11 +36,10 @@ describe('utils', () => {
       const sha = 'ABCDEF1234567';
       const artifactPath = 'a/path/to/file.zip';
       const path = computeArtifactDownloadPath(downloadDir, pr, sha, artifactPath);
-      expect(path).toBe(resolvePath('/a/b/c/123-ABCDEF1-file.zip'));
+      expect(path).toEqual('/a/b/c/123-ABCDEF1-file.zip');
     });
   });
 
-
   describe('getPrInfoFromDownloadPath', () => {
     it('should extract the PR and SHA from the file path', () => {
       const {pr, sha} = getPrInfoFromDownloadPath('a/b/c/12345-ABCDE-artifact.zip');
@@ -53,7 +48,6 @@ describe('utils', () => {
     });
   });
 
-
   describe('assertNotMissingOrEmpty()', () => {
 
     it('should throw if passed an empty value', () => {
@@ -128,79 +122,4 @@ describe('utils', () => {
 
   });
 
-
-  describe('Logger', () => {
-    let consoleErrorSpy: jasmine.Spy;
-    let consoleInfoSpy: jasmine.Spy;
-    let consoleLogSpy: jasmine.Spy;
-    let consoleWarnSpy: jasmine.Spy;
-    let logger: Logger;
-
-    beforeEach(() => {
-      consoleErrorSpy = spyOn(console, 'error');
-      consoleInfoSpy = spyOn(console, 'info');
-      consoleLogSpy = spyOn(console, 'log');
-      consoleWarnSpy = spyOn(console, 'warn');
-
-      logger = new Logger('TestScope');
-    });
-
-
-    it('should delegate to `console`', () => {
-      logger.error('foo');
-      expect(consoleErrorSpy).toHaveBeenCalledTimes(1);
-      expect(consoleErrorSpy.calls.argsFor(0)).toContain('foo');
-
-      logger.info('bar');
-      expect(consoleInfoSpy).toHaveBeenCalledTimes(1);
-      expect(consoleInfoSpy.calls.argsFor(0)).toContain('bar');
-
-      logger.log('baz');
-      expect(consoleLogSpy).toHaveBeenCalledTimes(1);
-      expect(consoleLogSpy.calls.argsFor(0)).toContain('baz');
-
-      logger.warn('qux');
-      expect(consoleWarnSpy).toHaveBeenCalledTimes(1);
-      expect(consoleWarnSpy.calls.argsFor(0)).toContain('qux');
-    });
-
-
-    it('should prepend messages with the current date and logger\'s scope', () => {
-      const mockDate = new Date(1337);
-      const expectedDateStr = `[${mockDate}]`;
-      const expectedScopeStr = 'TestScope:           ';
-
-      jasmine.clock().mockDate(mockDate);
-      jasmine.clock().withMock(() => {
-        logger.error();
-        logger.info();
-        logger.log();
-        logger.warn();
-      });
-
-      expect(consoleErrorSpy).toHaveBeenCalledWith(expectedDateStr, expectedScopeStr);
-      expect(consoleInfoSpy).toHaveBeenCalledWith(expectedDateStr, expectedScopeStr);
-      expect(consoleLogSpy).toHaveBeenCalledWith(expectedDateStr, expectedScopeStr);
-      expect(consoleWarnSpy).toHaveBeenCalledWith(expectedDateStr, expectedScopeStr);
-    });
-
-
-    it('should pass all arguments to `console`', () => {
-      const someString = jasmine.any(String);
-
-      logger.error('foo1', 'foo2');
-      expect(consoleErrorSpy).toHaveBeenCalledWith(someString, someString, 'foo1', 'foo2');
-
-      logger.info('bar1', 'bar2');
-      expect(consoleInfoSpy).toHaveBeenCalledWith(someString, someString, 'bar1', 'bar2');
-
-      logger.log('baz1', 'baz2');
-      expect(consoleLogSpy).toHaveBeenCalledWith(someString, someString, 'baz1', 'baz2');
-
-      logger.warn('qux1', 'qux2');
-      expect(consoleWarnSpy).toHaveBeenCalledWith(someString, someString, 'qux1', 'qux2');
-    });
-
-  });
-
 });

aio/aio-builds-setup/dockerbuild/scripts-js/test/helpers.ts

@@ -0,0 +1,6 @@
+declare namespace jasmine {
+  export interface DoneFn extends Function {
+    (): void;
+    fail: (message: Error | string) => void;
+  }
+}

aio/aio-builds-setup/dockerbuild/scripts-js/test/index.ts

@@ -3,4 +3,5 @@ import {runTests} from '../lib/common/run-tests';
 
 // Run
 const specFiles = [`${__dirname}/**/*.spec.js`];
-runTests(specFiles);
+const helpers = [`${__dirname}/helpers.js`];
+runTests(specFiles, helpers);

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/build-creator.spec.ts

@@ -5,7 +5,6 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as shell from 'shelljs';
 import {SHORT_SHA_LEN} from '../../lib/common/constants';
-import {Logger} from '../../lib/common/utils';
 import {BuildCreator} from '../../lib/preview-server/build-creator';
 import {ChangedPrVisibilityEvent, CreatedBuildEvent} from '../../lib/preview-server/build-events';
 import {PreviewServerError} from '../../lib/preview-server/preview-error';
@@ -492,7 +491,7 @@ describe('BuildCreator', () => {
     beforeEach(() => {
       cpExecCbs = [];
 
-      consoleWarnSpy = spyOn(Logger.prototype, 'warn');
+      consoleWarnSpy = spyOn(console, 'warn');
       shellChmodSpy = spyOn(shell, 'chmod');
       shellRmSpy = spyOn(shell, 'rm');
       cpExecSpy = spyOn(cp, 'exec').and.callFake((_: string, cb: (...args: any[]) => void) => cpExecCbs.push(cb));
@@ -514,7 +513,8 @@ describe('BuildCreator', () => {
 
     it('should log (as a warning) any stderr output if extracting succeeded', done => {
       (bc as any).extractArchive('foo', 'bar').
-        then(() => expect(consoleWarnSpy).toHaveBeenCalledWith('This is stderr')).
+        then(() => expect(consoleWarnSpy)
+          .toHaveBeenCalledWith(jasmine.any(String), 'BuildCreator:        ', 'This is stderr')).
         then(done);
 
       cpExecCbs[0](null, 'This is stdout', 'This is stderr');

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/build-retriever.spec.ts

@@ -1,13 +1,11 @@
 import * as fs from 'fs';
 import * as nock from 'nock';
-import {resolve as resolvePath} from 'path';
 import {BuildInfo, CircleCiApi} from '../../lib/common/circle-ci-api';
-import {Logger} from '../../lib/common/utils';
 import {BuildRetriever} from '../../lib/preview-server/build-retriever';
 
 describe('BuildRetriever', () => {
   const MAX_DOWNLOAD_SIZE = 10000;
-  const DOWNLOAD_DIR = resolvePath('/DOWNLOAD/DIR');
+  const DOWNLOAD_DIR = '/DOWNLOAD/DIR';
   const BASE_URL = 'http://test.com';
   const ARTIFACT_PATH = '/some/path/build.zip';
 
@@ -31,6 +29,10 @@ describe('BuildRetriever', () => {
       vcs_revision: 'COMMIT',
     };
 
+    spyOn(console, 'log');
+    spyOn(console, 'warn');
+    spyOn(console, 'error');
+
     api = new CircleCiApi('ORG', 'REPO', 'TOKEN');
     spyOn(api, 'getBuildInfo').and.callFake(() => Promise.resolve(BUILD_INFO));
     getBuildArtifactUrlSpy = spyOn(api, 'getBuildArtifactUrl')
@@ -89,7 +91,6 @@ describe('BuildRetriever', () => {
     let retriever: BuildRetriever;
 
     beforeEach(() => {
-      spyOn(Logger.prototype, 'warn');
       retriever = new BuildRetriever(api, MAX_DOWNLOAD_SIZE, DOWNLOAD_DIR);
     });
 
@@ -132,14 +133,11 @@ describe('BuildRetriever', () => {
 
     it('should write the artifact file to disk', async () => {
       const artifactRequest = nock(BASE_URL).get(ARTIFACT_PATH).reply(200, ARTIFACT_CONTENTS);
-      const downloadPath = resolvePath(`${DOWNLOAD_DIR}/777-COMMIT-build.zip`);
-
       await retriever.downloadBuildArtifact(12345, 777, 'COMMIT', ARTIFACT_PATH);
-      expect(writeFileSpy).toHaveBeenCalledWith(downloadPath, jasmine.any(Buffer), jasmine.any(Function));
-
+      expect(writeFileSpy)
+        .toHaveBeenCalledWith(`${DOWNLOAD_DIR}/777-COMMIT-build.zip`, jasmine.any(Buffer), jasmine.any(Function));
       const buffer: Buffer = writeFileSpy.calls.mostRecent().args[1];
       expect(buffer.toString()).toEqual(ARTIFACT_CONTENTS);
-
       artifactRequest.done();
     });
 

aio/aio-builds-setup/dockerbuild/scripts-js/test/preview-server/preview-server-factory.spec.ts

@@ -2,11 +2,11 @@
 import * as express from 'express';
 import * as http from 'http';
 import * as supertest from 'supertest';
+import {promisify} from 'util';
 import {CircleCiApi} from '../../lib/common/circle-ci-api';
 import {GithubApi} from '../../lib/common/github-api';
 import {GithubPullRequests} from '../../lib/common/github-pull-requests';
 import {GithubTeams} from '../../lib/common/github-teams';
-import {Logger} from '../../lib/common/utils';
 import {BuildCreator} from '../../lib/preview-server/build-creator';
 import {ChangedPrVisibilityEvent, CreatedBuildEvent} from '../../lib/preview-server/build-events';
 import {BuildRetriever, GithubInfo} from '../../lib/preview-server/build-retriever';
@@ -38,18 +38,15 @@ describe('PreviewServerFactory', () => {
     significantFilesPattern: '^(?:aio|packages)\\/(?!.*[._]spec\\.[jt]s$)',
     trustedPrLabel: 'trusted: pr-label',
   };
-  let loggerErrorSpy: jasmine.Spy;
-  let loggerInfoSpy: jasmine.Spy;
-  let loggerLogSpy: jasmine.Spy;
 
   // Helpers
   const createPreviewServer = (partialConfig: Partial<PreviewServerConfig> = {}) =>
     PreviewServerFactory.create({...defaultConfig, ...partialConfig});
 
   beforeEach(() => {
-    loggerErrorSpy = spyOn(Logger.prototype, 'error');
-    loggerInfoSpy = spyOn(Logger.prototype, 'info');
-    loggerLogSpy = spyOn(Logger.prototype, 'log');
+    spyOn(console, 'error');
+    spyOn(console, 'info');
+    spyOn(console, 'log');
   });
 
   describe('create()', () => {
@@ -143,10 +140,11 @@ describe('PreviewServerFactory', () => {
       const server = createPreviewServer();
       server.address = () => ({address: 'foo', family: '', port: 1337});
 
-      expect(loggerInfoSpy).not.toHaveBeenCalled();
+      expect(console.info).not.toHaveBeenCalled();
 
       server.emit('listening');
-      expect(loggerInfoSpy).toHaveBeenCalledWith('Up and running (and listening on foo:1337)...');
+      expect(console.info).toHaveBeenCalledWith(
+        jasmine.any(String), 'PreviewServer:       ', 'Up and running (and listening on foo:1337)...');
     });
 
   });
@@ -243,6 +241,10 @@ describe('PreviewServerFactory', () => {
     let buildCreator: BuildCreator;
     let agent: supertest.SuperTest<supertest.Test>;
 
+    // Helpers
+    const promisifyRequest = async (req: supertest.Request) => await promisify(req.end.bind(req))();
+    const verifyRequests = async (reqs: supertest.Request[]) => await Promise.all(reqs.map(promisifyRequest));
+
     beforeEach(() => {
       const circleCiApi = new CircleCiApi(defaultConfig.githubOrg, defaultConfig.githubRepo,
                                           defaultConfig.circleCiToken);
@@ -255,15 +257,14 @@ describe('PreviewServerFactory', () => {
       buildCreator = new BuildCreator(defaultConfig.buildsDir);
 
       const middleware = PreviewServerFactory.createMiddleware(buildRetriever, buildVerifier, buildCreator,
-                                                               defaultConfig);
+                                                              defaultConfig);
       agent = supertest.agent(middleware);
     });
 
-
     describe('GET /health-check', () => {
 
       it('should respond with 200', async () => {
-        await Promise.all([
+        await verifyRequests([
           agent.get('/health-check').expect(200),
           agent.get('/health-check/').expect(200),
         ]);
@@ -271,7 +272,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should respond with 404 for non-GET requests', async () => {
-        await Promise.all([
+        await verifyRequests([
           agent.put('/health-check').expect(404),
           agent.post('/health-check').expect(404),
           agent.patch('/health-check').expect(404),
@@ -281,7 +282,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should respond with 404 if the path does not match exactly', async () => {
-        await Promise.all([
+        await verifyRequests([
           agent.get('/health-check/foo').expect(404),
           agent.get('/health-check-foo').expect(404),
           agent.get('/health-checknfoo').expect(404),
@@ -293,104 +294,7 @@ describe('PreviewServerFactory', () => {
 
     });
 
-
-    describe('GET /can-have-public-preview/<pr>', () => {
-      const baseUrl = '/can-have-public-preview';
-      const pr = 777;
-      const url = `${baseUrl}/${pr}`;
-      let bvGetPrIsTrustedSpy: jasmine.Spy;
-      let bvGetSignificantFilesChangedSpy: jasmine.Spy;
-
-      beforeEach(() => {
-        bvGetPrIsTrustedSpy = spyOn(buildVerifier, 'getPrIsTrusted').and.returnValue(Promise.resolve(true));
-        bvGetSignificantFilesChangedSpy = spyOn(buildVerifier, 'getSignificantFilesChanged').
-          and.returnValue(Promise.resolve(true));
-      });
-
-
-      it('should respond with 404 for non-GET requests', async () => {
-        await Promise.all([
-          agent.put(url).expect(404),
-          agent.post(url).expect(404),
-          agent.patch(url).expect(404),
-          agent.delete(url).expect(404),
-        ]);
-      });
-
-
-      it('should respond with 404 if the path does not match exactly', async () => {
-        await Promise.all([
-          agent.get('/can-have-public-preview/42/foo').expect(404),
-          agent.get('/can-have-public-preview-foo/42').expect(404),
-          agent.get('/can-have-public-previewnfoo/42').expect(404),
-          agent.get('/foo/can-have-public-preview/42').expect(404),
-          agent.get('/foo-can-have-public-preview/42').expect(404),
-          agent.get('/fooncan-have-public-preview/42').expect(404),
-        ]);
-      });
-
-
-      it('should respond appropriately if the PR did not touch any significant files', async () => {
-        bvGetSignificantFilesChangedSpy.and.returnValue(Promise.resolve(false));
-
-        const expectedResponse = {canHavePublicPreview: false, reason: 'No significant files touched.'};
-        const expectedLog = `PR:${pr} - Cannot have a public preview, because it did not touch any significant files.`;
-
-        await agent.get(url).expect(200, expectedResponse);
-
-        expect(bvGetSignificantFilesChangedSpy).toHaveBeenCalledWith(pr, jasmine.any(RegExp));
-        expect(bvGetPrIsTrustedSpy).not.toHaveBeenCalled();
-        expect(loggerLogSpy).toHaveBeenCalledWith(expectedLog);
-      });
-
-
-      it('should respond appropriately if the PR is not automatically verifiable as "trusted"', async () => {
-        bvGetPrIsTrustedSpy.and.returnValue(Promise.resolve(false));
-
-        const expectedResponse = {canHavePublicPreview: false, reason: 'Not automatically verifiable as "trusted".'};
-        const expectedLog =
-          `PR:${pr} - Cannot have a public preview, because not automatically verifiable as "trusted".`;
-
-        await agent.get(url).expect(200, expectedResponse);
-
-        expect(bvGetSignificantFilesChangedSpy).toHaveBeenCalledWith(pr, jasmine.any(RegExp));
-        expect(bvGetPrIsTrustedSpy).toHaveBeenCalledWith(pr);
-        expect(loggerLogSpy).toHaveBeenCalledWith(expectedLog);
-      });
-
-
-      it('should respond appropriately if the PR can have a preview', async () => {
-        const expectedResponse = {canHavePublicPreview: true, reason: null};
-        const expectedLog = `PR:${pr} - Can have a public preview.`;
-
-        await agent.get(url).expect(200, expectedResponse);
-
-        expect(bvGetSignificantFilesChangedSpy).toHaveBeenCalledWith(pr, jasmine.any(RegExp));
-        expect(bvGetPrIsTrustedSpy).toHaveBeenCalledWith(pr);
-        expect(loggerLogSpy).toHaveBeenCalledWith(expectedLog);
-      });
-
-
-      it('should respond with error if `getSignificantFilesChanged()` fails', async () => {
-        bvGetSignificantFilesChangedSpy.and.callFake(() => Promise.reject('getSignificantFilesChanged error'));
-
-        await agent.get(url).expect(500, 'getSignificantFilesChanged error');
-        expect(loggerErrorSpy).toHaveBeenCalledWith('Previewability check error', 'getSignificantFilesChanged error');
-      });
-
-
-      it('should respond with error if `getPrIsTrusted()` fails', async () => {
-        const error = new Error('getPrIsTrusted error');
-        bvGetPrIsTrustedSpy.and.callFake(() => { throw error; });
-
-        await agent.get(url).expect(500, 'getPrIsTrusted error');
-        expect(loggerErrorSpy).toHaveBeenCalledWith('Previewability check error', error);
-      });
-
-    });
-
-
-    describe('POST /circle-build', () => {
+    describe('/circle-build', () => {
       let getGithubInfoSpy: jasmine.Spy;
       let getSignificantFilesChangedSpy: jasmine.Spy;
       let downloadBuildArtifactSpy: jasmine.Spy;
@@ -455,8 +359,8 @@ describe('PreviewServerFactory', () => {
         await agent.post(URL).send(BASIC_PAYLOAD).expect(204);
         expect(getGithubInfoSpy).not.toHaveBeenCalled();
         expect(getSignificantFilesChangedSpy).not.toHaveBeenCalled();
-        expect(loggerLogSpy).toHaveBeenCalledWith(
-          'Build:12345, Job:lint -', 'Skipping preview processing because this is not the "aio_preview" job.');
+        expect(console.log).toHaveBeenCalledWith(jasmine.any(String), 'PreviewServer:       ',
+        'Build:12345, Job:lint -', 'Skipping preview processing because this is not the "aio_preview" job.');
         expect(downloadBuildArtifactSpy).not.toHaveBeenCalled();
         expect(getPrIsTrustedSpy).not.toHaveBeenCalled();
         expect(createBuildSpy).not.toHaveBeenCalled();
@@ -467,7 +371,7 @@ describe('PreviewServerFactory', () => {
         await agent.post(URL).send(BASIC_PAYLOAD).expect(204);
         expect(getGithubInfoSpy).toHaveBeenCalledWith(BUILD_NUM);
         expect(getSignificantFilesChangedSpy).toHaveBeenCalledWith(PR, jasmine.any(RegExp));
-        expect(loggerLogSpy).toHaveBeenCalledWith(
+        expect(console.log).toHaveBeenCalledWith(jasmine.any(String), 'PreviewServer:       ',
           'PR:777, Build:12345 - Skipping preview processing because this PR did not touch any significant files.');
         expect(downloadBuildArtifactSpy).not.toHaveBeenCalled();
         expect(getPrIsTrustedSpy).not.toHaveBeenCalled();
@@ -563,7 +467,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should respond with 404 for non-POST requests', async () => {
-        await Promise.all([
+        await verifyRequests([
           agent.get(url).expect(404),
           agent.put(url).expect(404),
           agent.patch(url).expect(404),
@@ -578,7 +482,7 @@ describe('PreviewServerFactory', () => {
         const request1 = agent.post(url);
         const request2 = agent.post(url).send();
 
-        await Promise.all([
+        await verifyRequests([
           request1.expect(400, responseBody),
           request2.expect(400, responseBody),
         ]);
@@ -591,7 +495,7 @@ describe('PreviewServerFactory', () => {
         const request1 = agent.post(url).send({});
         const request2 = agent.post(url).send({number: null});
 
-        await Promise.all([
+        await verifyRequests([
           request1.expect(400, `${responseBodyPrefix} {}`),
           request2.expect(400, `${responseBodyPrefix} {"number":null}`),
         ]);
@@ -599,7 +503,7 @@ describe('PreviewServerFactory', () => {
 
 
       it('should call \'BuildVerifier#gtPrIsTrusted()\' with the correct arguments', async () => {
-        await createRequest(+pr);
+        await promisifyRequest(createRequest(+pr));
         expect(bvGetPrIsTrustedSpy).toHaveBeenCalledWith(9);
       });
 
@@ -607,8 +511,9 @@ describe('PreviewServerFactory', () => {
       it('should propagate errors from BuildVerifier', async () => {
         bvGetPrIsTrustedSpy.and.callFake(() => Promise.reject('Test'));
 
-        await createRequest(+pr).expect(500, 'Test');
+        const req = createRequest(+pr).expect(500, 'Test');
 
+        await promisifyRequest(req);
         expect(bvGetPrIsTrustedSpy).toHaveBeenCalledWith(9);
         expect(bcUpdatePrVisibilitySpy).not.toHaveBeenCalled();
       });
@@ -617,17 +522,19 @@ describe('PreviewServerFactory', () => {
       it('should call \'BuildCreator#updatePrVisibility()\' with the correct arguments', async () => {
         bvGetPrIsTrustedSpy.and.callFake((pr2: number) => Promise.resolve(pr2 === 42));
 
-        await createRequest(24);
+        await promisifyRequest(createRequest(24));
         expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledWith(24, false);
 
-        await createRequest(42);
+        await promisifyRequest(createRequest(42));
         expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledWith(42, true);
       });
 
 
       it('should propagate errors from BuildCreator', async () => {
         bcUpdatePrVisibilitySpy.and.callFake(() => Promise.reject('Test'));
-        await createRequest(+pr).expect(500, 'Test');
+
+        const req = createRequest(+pr).expect(500, 'Test');
+        await verifyRequests([req]);
       });
 
 
@@ -637,7 +544,7 @@ describe('PreviewServerFactory', () => {
           bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
 
           const reqs = [4, 2].map(num => createRequest(num).expect(200, http.STATUS_CODES[200]));
-          await Promise.all(reqs);
+          await verifyRequests(reqs);
         });
 
 
@@ -645,7 +552,7 @@ describe('PreviewServerFactory', () => {
           bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
 
           const reqs = [4, 2].map(num => createRequest(num, 'labeled').expect(200, http.STATUS_CODES[200]));
-          await Promise.all(reqs);
+          await verifyRequests(reqs);
         });
 
 
@@ -653,13 +560,14 @@ describe('PreviewServerFactory', () => {
           bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
 
           const reqs = [4, 2].map(num => createRequest(num, 'unlabeled').expect(200, http.STATUS_CODES[200]));
-          await Promise.all(reqs);
+          await verifyRequests(reqs);
         });
 
 
         it('should respond with 200 (and do nothing) if \'action\' implies no visibility change', async () => {
           const promises = ['foo', 'notlabeled'].
-            map(action => createRequest(+pr, action).expect(200, http.STATUS_CODES[200]));
+            map(action => createRequest(+pr, action).expect(200, http.STATUS_CODES[200])).
+            map(promisifyRequest);
 
           await Promise.all(promises);
           expect(bvGetPrIsTrustedSpy).not.toHaveBeenCalled();
@@ -676,7 +584,7 @@ describe('PreviewServerFactory', () => {
       it('should respond with 404', async () => {
         const responseFor = (method: string) => `Unknown resource in request: ${method.toUpperCase()} /some/url`;
 
-        await Promise.all([
+        await verifyRequests([
           agent.get('/some/url').expect(404, responseFor('get')),
           agent.put('/some/url').expect(404, responseFor('put')),
           agent.post('/some/url').expect(404, responseFor('post')),

aio/aio-builds-setup/dockerbuild/scripts-sh/clean-up.sh

@@ -2,7 +2,6 @@
 set -eu -o pipefail
 
 # Set up env variables
-export AIO_CIRCLE_CI_TOKEN=UNUSED_CIRCLE_CI_TOKEN
 export AIO_GITHUB_TOKEN=$(head -c -1 /aio-secrets/GITHUB_TOKEN 2>/dev/null)
 
 # Run the clean-up

aio/aio-builds-setup/docs/misc--integrate-with-ci.md

@@ -5,5 +5,4 @@ TODO (gkalpak): Add docs. Mention:
 - Testing on CI.
   Relevant files: `scripts/ci/test-aio.sh`, `aio/aio-builds-setup/scripts/test.sh`
 - Deploying from CI.
-  Relevant files: `.circleci/config.yml`, `scripts/ci/deploy.sh`, `aio/scripts/build-artifacts.sh`,
-  `aio/scripts/deploy-to-firebase.sh`
+  Relevant files: `scripts/ci/deploy.sh`, `aio/scripts/deploy-to-firebase.sh`

aio/aio-builds-setup/docs/overview--general.md

@@ -34,31 +34,34 @@ container:
 
 
 ### On CI (CircleCI)
-- The CI script builds the angular.io project.
+- Build job completes successfully.
+- The CI script checks whether the build job was initiated by a PR against the angular/angular
+  master branch.
+- The CI script checks whether the PR has touched any files that might affect the angular.io app
+  (currently the `aio/` or `packages/` directories, ignoring spec files).
 - The CI script gzips and stores the build artifacts in the CI infrastructure.
-- When the build completes, CircleCI triggers a webhook on the preview-server.
+- When the build completes CircleCI triggers a webhook on the preview-server.
 
 More info on how to set things up on CI can be found [here](misc--integrate-with-ci.md).
 
 
 ### Hosting build artifacts
+
 - nginx receives the webhook trigger and passes it through to the preview server.
-- The preview-server runs several preliminary checks to determine whether the request is valid and
-  whether the corresponding PR can have a (public or non-public) preview (more details can be found
-  [here](overview--security-model.md)).
 - The preview-server makes a request to CircleCI for the URL of the AIO build artifacts.
 - The preview-server makes a request to this URL to receive the artifact - failing if the size
   exceeds the specified max file size - and stores it in a temporary location.
-- The preview-server runs more checks to determine whether the preview should be publicly accessible
-  or stored for later verification (more details can be found [here](overview--security-model.md)).
+- The preview-server runs several checks to determine whether the request should be accepted and
+  whether it should be publicly accessible or stored for later verification (more details can be
+  found [here](overview--security-model.md)).
 - The preview-server changes the "visibility" of the associated PR, if necessary. For example, if
   builds for the same PR had been previously deployed as non-public and the current build has been
   automatically verified, all previous builds are made public as well.
   If the PR transitions from "non-public" to "public", the preview-server posts a comment on the
   corresponding PR on GitHub mentioning the SHAs and the links where the previews can be found.
 - The preview-server verifies that it is not trying to overwrite an existing build.
-- The preview-server deploys the artifacts to a sub-directory named after the PR number and the
-  first few characters of the SHA: `<PR>/<SHA>/`
+- The preview-server deploys the artifacts to a sub-directory named after the PR number and the first
+  few characters of the SHA: `<PR>/<SHA>/`
   (Non-publicly accessible PRs will be stored in a different location, but again derived from the PR
   number and SHA.)
 - If the PR is publicly accessible, the preview-server posts a comment on the corresponding PR on
@@ -98,8 +101,8 @@ More info on the possible HTTP status codes and their meaning can be found
 
 ### Removing obsolete artifacts
 In order to avoid flooding the disk with unnecessary build artifacts, there is a cronjob that runs a
-clean-up task once a day. The task retrieves all open PRs from GitHub and removes all directories
-that do not correspond to an open PR.
+clean-up tasks once a day. The task retrieves all open PRs from GitHub and removes all directories
+that do not correspond with an open PR.
 
 
 ### Health-check

aio/aio-builds-setup/docs/overview--http-status-codes.md

@@ -1,8 +1,8 @@
 # Overview - HTTP Status Codes
 
 
-This is a list of all the possible HTTP status codes returned by the nginx and preview servers,
-along with a brief explanation of what they mean:
+This is a list of all the possible HTTP status codes returned by the nginx and preview servers, along
+with a brief explanation of what they mean:
 
 
 ## `http://*.ngbuilds.io/*`
@@ -25,23 +25,6 @@ along with a brief explanation of what they mean:
   File not found.
 
 
-## `https://ngbuilds.io/can-have-public-preview/<pr>`
-
-- **200 (OK)**:
-  Whether the PR can have a public preview (based on its author, label, changed files).
-  _Response type:_ JSON
-  _Response format:_
-  ```ts
-  {
-    canHavePublicPreview: boolean,
-    reason: string | null,
-  }
-  ```
-
-- **405 (Method Not Allowed)**:
-  Request method other than GET.
-
-
 ## `https://ngbuilds.io/circle-build`
 
 - **201 (Created)**:

aio/aio-builds-setup/docs/overview--security-model.md

@@ -11,8 +11,8 @@ part of the CI process and serving them publicly.
 
 ## Security objectives
 
-- **Prevent hosting arbitrary content on our servers.**
-  Since there is no restriction on who can submit a PR, we cannot allow arbitrary, untrusted PRs'
+- **Prevent hosting arbitrary content to on servers.**
+  Since there is no restriction on who can submit a PR, we cannot allow arbitrary untrusted PRs'
   build artifacts to be hosted.
 
 - **Prevent overwriting other people's hosted build artifacts.**
@@ -40,49 +40,40 @@ part of the CI process and serving them publicly.
 ### In a nutshell
 The implemented approach can be broken up to the following sub-tasks:
 
-1. Receive notification from CircleCI of a completed build.
-2. Verify that the build is valid and can have a preview.
-3. Download the build artifact.
-4. Fetch the PR's metadata, including author and labels.
-5. Check whether the PR can be automatically verified as "trusted" (based on its author or labels).
-6. If necessary, update the corresponding PR's verification status.
-7. Deploy the artifacts to the corresponding PR's directory.
-8. Prevent overwriting previously deployed artifacts (which ensures that the guarantees established
+0. Receive notification from CircleCI of a completed build.
+1. Verify that the build is valid and download the artifact.
+2. Fetch the PR's metadata, including author and labels.
+3. Check whether the PR can be automatically verified as "trusted" (based on its author or labels).
+4. If necessary, update the corresponding PR's verification status.
+5. Deploy the artifacts to the corresponding PR's directory.
+6. Prevent overwriting previously deployed artifacts (which ensures that the guarantees established
    during deployment will remain valid until the artifacts are removed).
-9. Prevent hosted preview files from accessing anything outside their directory.
+7. Prevent hosted preview files from accessing anything outside their directory.
 
 
 ### Implementation details
 This section describes how each of the aforementioned sub-tasks is accomplished:
 
-1. **Receive notification from CircleCI of a completed build**
+0. **Receive notification from CircleCI of a completed build**
 
   CircleCI is configured to trigger a webhook on our preview-server whenever a build completes.
   The payload contains the number of the build that completed.
 
-2. **Verify that the build is valid and can have a preview.**
+1. **Verify that the build is valid and download the artifact.**
 
    We cannot trust that the data in the webhook trigger is authentic, so we only extract the build
    number and then run a direct query against the CircleCI API to get hold of the real data for
    the given build number.
 
-   We perform a number of preliminary checks:
-   - Was the webhook triggered by the designated CircleCI job (currently `aio_preview`)?
-   - Was the build successful?
-   - Are the associated GitHub organisation and repository what we expect (e.g. `angular/angular`)?
-   - Has the PR touched any files that might affect the angular.io app (currently the `aio/` or
-     `packages/` directories, ignoring spec files)?
+   If the build was not successful then we ignore this trigger. Otherwise we check that the
+   associated github organisation and repository are what we expect (e.g. angular/angular).
 
-   If any of the preliminary checks fails, the process is aborted and not preview is generated.
-
-3. **Download the build artifact.**
-
-   Next we make another call to the CircleCI API to get a list of the URLs for artifacts of that
+   Next we make another call to the CircleCI API to get a list of the URLS for artifacts of that
    build. If there is one that matches the configured artifact path, we download the contents of the
    build artifact and store it in a local folder. This download has a maximum size limit to prevent
    PRs from producing artifacts that are so large they would cause the preview server to crash.
 
-4. **Fetch the PR's metadata, including author and labels**.
+2. **Fetch the PR's metadata, including author and labels**.
 
    Once we have securely downloaded the artifact for a build, we retrieve the PR's metadata -
    including the author's username and the labels - using the
@@ -90,7 +81,7 @@ This section describes how each of the aforementioned sub-tasks is accomplished:
    To avoid rate-limit restrictions, we use a Personal Access Token (issued by
    [@mary-poppins](https://github.com/mary-poppins)).
 
-5. **Check whether the PR can be automatically verified as "trusted"**.
+3. **Check whether the PR can be automatically verified as "trusted"**.
 
    "Trusted" means that we are confident that the build artifacts are suitable for being deployed
    and publicly accessible on the preview server. There are two ways to check that:
@@ -102,32 +93,31 @@ This section describes how each of the aforementioned sub-tasks is accomplished:
       `read:org` scope issued by a user that can "see" the specified GitHub organization.
       Here too, we use the token by @mary-poppins.
 
-6. **If necessary update the corresponding PR's verification status**.
+4. **If necessary update the corresponding PR's verification status**.
 
    Once we have determined whether the PR is considered "trusted", we update its "visibility" (i.e.
    whether it is publicly accessible or not), based on the new verification status. For example, if
    a PR was initially considered "not trusted" but the check triggered by a new build determined
-   otherwise, the PR (and all the previously downloaded previews) are made public. It works the same
+   otherwise, the PR (and all the previously hosted previews) are made public. It works the same
    way if a PR has gone from "trusted" to "not trusted".
 
-7. **Deploy the artifacts to the corresponding PR's directory.**
+5. **Deploy the artifacts to the corresponding PR's directory.**
 
-   With the preceding steps, we have verified that the build artifacts are valid. Additionally, we
-   have determined whether the PR can be trusted to have its previews publicly accessible or whether
-   further verification is necessary.
+   With the preceding steps, we have verified that the build artifacts are valid.
+   Additionally, we have determined whether the PR can be trusted to have its previews
+   publicly accessible or whether further verification is necessary. The artifacts will be stored to
+   the PR's directory, but will not be publicly accessible unless the PR has been verified.
+   Essentially, as long as sub-tasks 1, 2 and 3 can be securely accomplished, it is possible to
+   "project" the trust we have in a team's members through the PR to the build artifacts.
 
-   The artifacts will be stored to the PR's directory, but will not be publicly accessible unless
-   the PR has been verified. Essentially, as long as sub-tasks 2, 3, 4 and 5 can be securely
-   accomplished, it is possible to "project" the trust we have in a team's members through the PR to
-   the build artifacts.
-
-8. **Prevent overwriting previously deployed artifacts**.
+6. **Prevent overwriting previously deployed artifacts**.
 
    In order to enforce this restriction (and ensure that the deployed artifacts' validity is
-   preserved throughout their "lifetime"), the server that handles the artifacts (currently a Node.js Express server) rejects builds that have already been handled.
+   preserved throughout their "lifetime"), the server that handles the artifacts (currently a Node.js
+   Express server) rejects builds that have already been handled.
    _Note: A PR can contain multiple builds; one for each SHA that was built on CircleCI._
 
-9. **Prevent hosted preview files from accessing anything outside their directory.**
+7. **Prevent hosted preview files from accessing anything outside their directory.**
 
    Nginx (which is used to serve the hosted preview) has been configured to not follow symlinks
    outside of the directory where the preview files are stored.
@@ -140,10 +130,10 @@ This section describes how each of the aforementioned sub-tasks is accomplished:
   This means that any secret access keys need only be stored on the preview-server and not on any of
   the CI build infrastructure (e.g. CircleCI).
 
-- Each trusted PR author has full control over the content that is hosted as a preview for their
-  PRs. Part of the security model relies on the trustworthiness of these authors.
+- Each trusted PR author has full control over the content that is hosted as a preview for their PRs.
+  Part of the security model relies on the trustworthiness of these authors.
 
-- Adding the specified label on a PR to mark it as trusted, gives the author full control over the
-  content that is hosted for the specific PR preview (e.g. by pushing more commits to it). The user
-  adding the label is responsible for ensuring that this control is not abused and that the PR is
-  either closed (one way of another) or the access is revoked.
+- Adding the specified label on a PR to mark it as trusted, gives the author full control over
+  the content that is hosted for the specific PR preview (e.g. by pushing more commits to it).
+  The user adding the label is responsible for ensuring that this control is not abused and that
+  the PR is either closed (one way of another) or the access is revoked.

aio/aio-builds-setup/docs/vm-setup--set-up-secrets.md

@@ -8,7 +8,7 @@ Necessary secrets:
 1. `GITHUB_TOKEN`
    - Used for:
      - Retrieving open PRs without rate-limiting.
-     - Retrieving PR info, such as author, labels, changed files.
+     - Retrieving PR author.
      - Retrieving members of the trusted GitHub teams.
      - Posting comments with preview links on PRs.
 
@@ -25,9 +25,8 @@ Necessary secrets:
    - Generate new token with the `public_repo` scope.
 
 2. `CIRCLE_CI_TOKEN`
-   - Visit https://circleci.com/gh/angular/angular/edit#api.
-   - Create an API token with `Build Artifacts` scope.
-
+   - Visit https://circleci.com/gh/angular/angular/edit#api
+   - Create an API token with `Build Artifacts` scope
 
 ## Save secrets on the VM
 

aio/content/cli-src/.gitignore

@@ -0,0 +1 @@
+yarn.lock

aio/content/cli-src/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@angular/cli": "https://github.com/angular/cli-builds#master"
+  }
+}

aio/content/cli/index.md

@@ -0,0 +1,83 @@
+<h1 class="no-toc">CLI Command Reference</h1>
+
+The Angular CLI is a command-line tool that you use to initialize, develop, scaffold, and maintain Angular applications.
+
+## Getting Started
+
+### Installing Angular CLI
+
+The current version of Angular CLI is 6.x.
+
+* Both the CLI and the projects that you generate with the tool have dependencies that require Node 8.9 or higher, together with NPM 5.5.1 or higher.
+* Install the CLI using npm:
+  `npm install -g @angular/cli`
+* The CLI is an open-source tool:
+  https://github.com/angular/angular-cli/tree/master/packages/angular/cli
+
+For details about changes between versions, and information about updating from previous releases, see the Releases tab on GitHub.
+
+### Basic workflow
+
+Invoke the tool on the command line through the ng executable. Online help is available on the command line:
+
+```
+> ng help               Lists commands with short descriptions
+> ng <command> --help   Lists options for a command.
+```
+
+To create, build, and serve a new, basic Angular project on a development server, use the following commands:
+
+```
+cd <parent of new workspace>
+ng new my-project
+cd my-project
+ng serve
+```
+
+In your browser, open http://localhost:4200/ to see the new app run.
+
+### Workspaces and project files
+
+Angular 6 introduced the workspace directory structure for Angular apps. A workspace defines a project. A project can contain multiple apps, as well as libraries that can be used in any of the apps.
+
+Some commands (such as build) must be executed from within a workspace folder, and others (such as new) must be executed from outside any workspace. This requirement is called out in the description of each command where it applies.The `new` command creates a [workspace](guide/glossary#workspace) to contain [projects](guide/glossary#project). A project can be an app or a library, and a workspace can contain multiple apps and libraries.
+
+A newly generated app project contains the source files for a root module, with a root component and template, which you can edit directly, or add to and modify using CLI commands. Use the generate command to add new files for additional components and services, and code for new pipes, directives, and so on.
+
+* Commands such as `add` and `generate`, that create or operate on apps and libraries, must be executed from within a workspace folder.
+* Apps in a workspace can use libraries in the same workspace.
+* Each project has a `src` folder that contains the logic, data, and assets.
+  See an example of the [file structure](guide/quickstart#project-file-review) in [Getting Started](guide/quickstart).
+
+When you use the `serve` command to build an app, the server automatically rebuilds the app and reloads the page when you change any of the source files.
+
+### Configuring the CLI
+
+Configuration files let you customize your project. The CLI configuration file, angular.json, is created at the top level of the project folder. This is where you can set CLI defaults for your project, and specify which files to include when the CLI builds the project.
+
+The CLI config command lets you set and retrieve configuration values from the command line, or you can edit the angular.json file directly.
+
+* See the complete schema for angular.json.
+* Learn more about configuration options for Angular (link to new guide?)
+
+### Command options and arguments
+
+All commands and some options have aliases, as listed in the descriptions. Option names are prefixed with a double dash (--), but arguments and option aliases are not.
+
+Typically, the name of a generated artifact can be given as an argument to the command or specified with the --name option. Most commands have additional options.
+
+Command syntax is shown as follows:
+
+```
+ng commandNameOrAlias <arg> [options]
+```
+
+Options take either string or Boolean arguments. Defaults are shown in bold for Boolean or enumerated values, and are given with the description. For example:
+
+```
+	--optionNameOrAlias=<filename>
+	--optionNameOrAlias=true|false
+	--optionNameOrAlias=allowedValue1|allowedValue2|allowedValue3
+```
+
+Boolean options can also be expressed with a prefix `no-`  to indicate a value of false. For example,  `--no-prod` is equivalent to `--prod=false`.

aio/content/examples/observables/src/subscribing.ts

@@ -4,7 +4,7 @@ import { Observable, of } from 'rxjs';
 // #docregion observer
 
 // Create simple observable that emits three values
-const myObservable = of(1, 2, 3);
+const myObservable = Observable.of(1, 2, 3);
 
 // Create observer object
 const myObserver = {

aio/content/examples/testing/src/app/demo/async-helper.spec.ts

@@ -1,7 +1,8 @@
 // tslint:disable-next-line:no-unused-variable
 import { async, fakeAsync, tick } from '@angular/core/testing';
-import { interval, of } from 'rxjs';
-import { delay, take } from 'rxjs/operators';
+
+import { of } from 'rxjs';
+import { delay } from 'rxjs/operators';
 
 describe('Angular async helper', () => {
   let actuallyDone = false;
@@ -20,120 +21,49 @@ describe('Angular async helper', () => {
   });
 
   it('should run async test with task',
-     async(() => { setTimeout(() => { actuallyDone = true; }, 0); }));
-
-  it('should run async test with task', async(() => {
-       const id = setInterval(() => {
-         actuallyDone = true;
-         clearInterval(id);
-       }, 100);
-     }));
+      async(() => { setTimeout(() => { actuallyDone = true; }, 0); }));
 
   it('should run async test with successful promise', async(() => {
-       const p = new Promise(resolve => { setTimeout(resolve, 10); });
-       p.then(() => { actuallyDone = true; });
-     }));
+    const p = new Promise(resolve => { setTimeout(resolve, 10); });
+    p.then(() => { actuallyDone = true; });
+  }));
 
   it('should run async test with failed promise', async(() => {
-       const p = new Promise((resolve, reject) => { setTimeout(reject, 10); });
-       p.catch(() => { actuallyDone = true; });
-     }));
+    const p = new Promise((resolve, reject) => { setTimeout(reject, 10); });
+    p.catch(() => { actuallyDone = true; });
+  }));
 
-  // Use done. Can also use async or fakeAsync.
+  // Use done. Cannot use setInterval with async or fakeAsync
+  // See https://github.com/angular/angular/issues/10127
   it('should run async test with successful delayed Observable', (done: DoneFn) => {
-    const source = of (true).pipe(delay(10));
-    source.subscribe(val => actuallyDone = true, err => fail(err), done);
+    const source = of(true).pipe(delay(10));
+    source.subscribe(
+      val => actuallyDone = true,
+      err => fail(err),
+      done
+    );
   });
 
-  // #docregion fake-async-test-tick
-  it('should run timeout callback with delay after call tick with millis', fakeAsync(() => {
-       let called = false;
-       setTimeout(() => { called = true; }, 100);
-       tick(100);
-       expect(called).toBe(true);
-     }));
-  // #enddocregion fake-async-test-tick
+  // Cannot use setInterval from within an async zone test
+  // See https://github.com/angular/angular/issues/10127
+  // xit('should run async test with successful delayed Observable', async(() => {
+  // const source = of(true).pipe(delay(10));
+  //   source.subscribe(
+  //     val => actuallyDone = true,
+  //     err => fail(err)
+  //   );
+  // }));
 
-  // #docregion fake-async-test-date
-  it('should get Date diff correctly in fakeAsync', fakeAsync(() => {
-       const start = Date.now();
-       tick(100);
-       const end = Date.now();
-       expect(end - start).toBe(100);
-     }));
-  // #enddocregion fake-async-test-date
+  // // Fail message: Error: 1 periodic timer(s) still in the queue
+  // // See https://github.com/angular/angular/issues/10127
+  // xit('should run async test with successful delayed Observable', fakeAsync(() => {
+  // const source = of(true).pipe(delay(10));
+  //   source.subscribe(
+  //     val => actuallyDone = true,
+  //     err => fail(err)
+  //   );
 
-  // #docregion fake-async-test-rxjs
-  it('should get Date diff correctly in fakeAsync with rxjs scheduler', fakeAsync(() => {
-       // need to add `import 'zone.js/dist/zone-patch-rxjs-fake-async'
-       // to patch rxjs scheduler
-       let result = null;
-       of ('hello').pipe(delay(1000)).subscribe(v => { result = v; });
-       expect(result).toBeNull();
-       tick(1000);
-       expect(result).toBe('hello');
-
-       const start = new Date().getTime();
-       let dateDiff = 0;
-       interval(1000).pipe(take(2)).subscribe(() => dateDiff = (new Date().getTime() - start));
-
-       tick(1000);
-       expect(dateDiff).toBe(1000);
-       tick(1000);
-       expect(dateDiff).toBe(2000);
-     }));
-  // #enddocregion fake-async-test-rxjs
-
-  // #docregion fake-async-test-clock
-  describe('use jasmine.clock()', () => {
-    // need to config __zone_symbol__fakeAsyncPatchLock flag
-    // before loading zone.js/dist/zone-testing
-    beforeEach(() => { jasmine.clock().install(); });
-    afterEach(() => { jasmine.clock().uninstall(); });
-    it('should auto enter fakeAsync', () => {
-      // is in fakeAsync now, don't need to call fakeAsync(testFn)
-      let called = false;
-      setTimeout(() => { called = true; }, 100);
-      jasmine.clock().tick(100);
-      expect(called).toBe(true);
-    });
-  });
-  // #enddocregion fake-async-test-clock
-
-  // #docregion async-test-promise-then
-  describe('test jsonp', () => {
-    function jsonp(url: string, callback: Function) {
-      // do a jsonp call which is not zone aware
-    }
-    // need to config __zone_symbol__supportWaitUnResolvedChainedPromise flag
-    // before loading zone.js/dist/zone-testing
-    it('should wait until promise.then is called', async(() => {
-         let finished = false;
-         new Promise((res, rej) => {
-           jsonp('localhost:8080/jsonp', () => {
-             // success callback and resolve the promise
-             finished = true;
-             res();
-           });
-         }).then(() => {
-           // async will wait until promise.then is called
-           // if __zone_symbol__supportWaitUnResolvedChainedPromise is set
-           expect(finished).toBe(true);
-         });
-       }));
-  });
-  // #enddocregion async-test-promise-then
-
-  it('should run async test with successful delayed Observable', async(() => {
-       const source = of (true).pipe(delay(10));
-       source.subscribe(val => actuallyDone = true, err => fail(err));
-     }));
-
-  it('should run async test with successful delayed Observable', fakeAsync(() => {
-       const source = of (true).pipe(delay(10));
-       source.subscribe(val => actuallyDone = true, err => fail(err));
-
-       tick(10);
-     }));
+  //   tick();
+  // }));
 
 });

aio/content/guide/aot-compiler.md

@@ -1241,7 +1241,7 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
   ### Non-null type assertion operator
 
   Use the [non-null type assertion operator](guide/template-syntax#non-null-assertion-operator)
-  to suppress the `Object is possibly 'undefined'` error when it is inconvenient to use
+  to suppress the `Object is possibly 'undefined'` error when it is incovienent to use
   `*ngIf` or when some constraint in the component ensures that the expression is always
   non-null when the binding expression is interpolated.
 
@@ -1308,6 +1308,28 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
   }
   ```
 
+{@a tsconfig-extends}
+## Configuration inheritance with extends
+Similar to TypeScript Compiler, Angular Compiler also supports `extends` in the `tsconfig.json` on `angularCompilerOptions`. A tsconfig file can inherit configurations from another file using the `extends` property.
+ The `extends` is a top level property parallel to `compilerOptions` and `angularCompilerOptions`. 
+ The configuration from the base file are loaded first, then overridden by those in the inheriting config file.
+ Example:
+```json
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    ...
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "preserveWhitespaces": true,
+    ...
+  }
+}
+```
+ More information about tsconfig extends can be found in the [TypeScript Handbook](https://www.typescriptlang.org/docs/handbook/tsconfig-json.html).
+
 {@a compiler-options}
 ## Angular template compiler options
 
@@ -1344,7 +1366,7 @@ for example, the content of annotations (such as a component's template), which
 emits to the `.js` file but not to the `.d.ts` file.
 
 This option should be set to `true` if you are using TypeScript's `--outFile` option, because the metadata files
-are not valid for this style of TypeScript output. It is not recommended to use `--outFile` with
+are not valid for this style of TypeScript output. It is not recommeded to use `--outFile` with
 Angular. Use a bundler, such as [webpack](https://webpack.js.org/), instead.
 
 This option can also be set to `true` when using factory summaries because the factory summaries
@@ -1439,7 +1461,7 @@ JavaScript with [JSDoc](http://usejsdoc.org/) comments needed by the
 ### *annotationsAs*
 
 Use this option to modify how the Angular specific annotations are emitted to improve tree-shaking. Non-Angular
-annotations and decorators are unaffected. Default is `static fields`.
+annotations and decorators are unnaffected. Default is `static fields`.
 
 <style>
   td, th {vertical-align: top}

aio/content/guide/architecture-next-steps.md

@@ -17,7 +17,7 @@ Here are some key features.
 * [Server-side Rendering](guide/universal): Angular Universal generates static application pages on the server through server-side rendering (SSR). This allows you to run your Angular app on the server in order to improve performance and show the first page quickly on mobile and low-powered devices, and also facilitate web crawlers.
 
 * [Service Workers](guide/service-worker-intro): Use a service worker to reduce dependency on the network
-significantly improving the user experience.
+significantly improving the use experience.
 
 ## Domain-specific libraries
 

aio/content/guide/attribute-directives.md

@@ -15,7 +15,7 @@ There are three kinds of directives in Angular:
 1. Attribute directives—change the appearance or behavior of an element, component, or another directive.
 
 *Components* are the most common of the three directives.
-You saw a component for the first time in the [Getting Started](guide/quickstart).
+You saw a component for the first time in the [QuickStart](guide/quickstart) guide.
 
 *Structural Directives* change the structure of the view.
 Two examples are [NgFor](guide/template-syntax#ngFor) and [NgIf](guide/template-syntax#ngIf).

aio/content/guide/comparing-observables.md

@@ -19,7 +19,7 @@ Observables are often compared to promises. Here are some key differences:
 
 ### Creation and subscription
 
-* Observables are not executed until a consumer subscribes. The `subscribe()` executes the defined behavior once, and it can be called again. Each subscription has its own computation. Resubscription causes recomputation of values.
+* Observables are not executed until a consumer subcribes. The `subscribe()` executes the defined behavior once, and it can be called again. Each subscription has its own computation. Resubscription causes recomputation of values.
 
 <code-example hideCopy>
 // declare a publishing operation

aio/content/guide/dependency-injection-in-action.md

@@ -149,7 +149,7 @@ By default, the DI framework searches for a provider in the injector hierarchy,
 starting at the component's local injector of the component, and if necessary bubbling up 
 through the injector tree until it reaches the root injector.
 
-* The first injector configured with a provider supplies the dependency (a service instance or value) to the constructor.  
+* The first injector configured with a provider supplies the the dependency (a service instance or value) to the constructor.  
 
 * If no provider is found in the root injector, the DI framework returns null to the constructor.
 
@@ -260,7 +260,7 @@ Using a custom provider allows you to provide a concrete implementation for impl
 
 </code-example>
 
-The `factory` function returns the `localStorage` property that is attached to the browser window object. The `Inject` decorator is a constructor parameter used to specify a custom provider of a dependency. This custom provider can now be overridden during testing with a mock API of `localStorage` instead of interactive with real browser APIs.
+The `factory` function returns the `localStorage` property that is attached to the browser window object. The `Inject` decorator is a constructor parameter used to specify a custom provider of a dependency. This custom provider can now be overriden during testing with a mock API of `localStorage` instead of interactive with real browser APIs.
 
 ### Modify the provider search with `@Self` and `@SkipSelf`
 

aio/content/guide/dependency-injection-navtree.md

@@ -112,7 +112,7 @@ The `CraigComponent` tries to inject `Base` into its `alex` constructor paramete
 
 
 
-Unfortunately, this doesn't work.
+Unfortunately, this does'nt work.
 The <live-example name="dependency-injection-in-action"></live-example>
 confirms that the `alex` parameter is null.
 *You cannot inject a parent by its base class.*

aio/content/guide/dependency-injection.md

@@ -240,7 +240,7 @@ The `@Injectable()` decorator is the standard decorator for service classes.
 
 <div class="alert-is-helpful">
 
- The decorator requirement is imposed by TypeScript. TypeScript normally discards parameter type information when it [transpiles](guide/glossary#transpile) the code to JavaScript. TypeScript preserves this information if the class has a decorator and the `emitDecoratorMetadata` compiler option is set `true` in TypeScript's `tsconfig.json` configuration file. The CLI configures `tsconfig.json` with `emitDecoratorMetadata: true`.
+ The decorator requirement is imposed by TypeScript. TypeScript normally discards parameter type information when it [transpiles]((guide/glossary#transpile) the code to JavaScript. TypeScript preserves this information if the class has a decorator and the `emitDecoratorMetadata` compiler option is set `true` in TypeScript's `tsconfig.json` configuration file. The CLI configures `tsconfig.json` with `emitDecoratorMetadata: true`.
  
  This means you're responsible for putting `@Injectable()` on your service classes.
 

aio/content/guide/displaying-data.md

@@ -31,7 +31,7 @@ The easiest way to display a component property
 is to bind the property name through interpolation.
 With interpolation, you put the property name in the view template, enclosed in double curly braces: `{{myHero}}`.
 
-Follow the [Getting Started](guide/quickstart) instructions for creating a new project
+Follow the [quickstart](guide/quickstart) instructions for creating a new project
 named <code>displaying-data</code>.
 
 Delete the <code>app.component.html</code> file. It is not needed for this example.

aio/content/guide/elements.md

@@ -107,7 +107,7 @@ The recently-developed [custom elements](https://developer.mozilla.org/en-US/doc
 </tr>
 <tr>
   <td>Firefox</td>
-  <td> Set the <code>dom.webcomponents.enabled</code> and <code>dom.webcomponents.customelements.enabled</code> preferences to true. Planned to be enabled by default in version 63.</td>
+  <td> Set the <code>dom.webcomponents.enabled</code> and <code>dom.webcomponents.customelements.enabled</code> preferences to true. Planned to be enabled by default in version 60/61.</td>
 </tr>
 <tr>
   <td>Edge</td>

aio/content/guide/forms-overview.md

@@ -84,7 +84,7 @@ The abstraction of the form model promotes simplicity over structure. The templa
 
 ## Data flow in forms
 
-When building forms in Angular, it's important to understand how the framework handles data flowing from the user or from programmatic changes. Reactive and template-driven forms follow two different strategies when handling form input. The data flow examples below begin with the favorite color input field example from above, and they show how changes to favorite color are handled in reactive forms compared to template-driven forms.
+When building forms in Angular, it's important to understand how the the framework handles data flowing from the user or from programmatic changes. Reactive and template-driven forms follow two different strategies when handling form input. The data flow examples below begin with the favorite color input field example from above, and they show how changes to favorite color are handled in reactive forms compared to template-driven forms.
 
 ### Data flow in reactive forms
 
@@ -253,7 +253,7 @@ To learn more about reactive forms, see the following guides:
 * [Form Validation](guide/form-validation#reactive-form-validation)
 * [Dynamic forms](guide/dynamic-form)
 
-To learn more about template-driven forms, see the following guides:
+To learn more about tempate-driven forms, see the following guides:
 
 * [Template-driven Forms](guide/forms)
 * [Form Validation](guide/form-validation#template-driven-validation)

aio/content/guide/glossary.md

@@ -77,7 +77,7 @@ A way to initialize and launch an app or system.
 
 In Angular, an app's root NgModule (`AppModule`) has a `bootstrap` property that identifies the app's top-level [components](guide/glossary#component). 
 During the bootstrap process, Angular creates and inserts these components into the `index.html` host web page.
-You can bootstrap multiple apps in the same `index.html`. Each app contains its own components.
+You can bootstrap multiple apps in the same `index.html`. Each app ccontains its own components.
 
 Learn more in [Bootstrapping](guide/bootstrapping).
 
@@ -132,7 +132,7 @@ A [decorator](guide/glossary#decorator) statement immediately before a field in
 
 The [Angular CLI](https://cli.angular.io/) is a command-line tool for managing the Angular development cycle. Use it to create the initial filesystem scaffolding for a [workspace](guide/glossary#workspace) or [project](guide/glossary#project), and to run [schematics](guide/glossary#schematic) that add and modify code for initial generic versions of various elements. The CLI supports all stages of the development cycle, including building, testing, bundling, and deployment.
 
-* To begin using the CLI for a new project, see [Getting Started](guide/quickstart).
+* To begin using the CLI for a new project, see [QuickStart](guide/quickstart).
 * To learn more about the full capabilities of the CLI, see the [Angular CLI documentation](https://github.com/angular/angular-cli/wiki).
 
 {@a component}

aio/content/guide/http.md

@@ -936,7 +936,7 @@ setting up such mocking straightforward.
 ### Mocking philosophy
 
 Angular's HTTP testing library is designed for a pattern of testing wherein 
-the app executes code and makes requests first.
+the the app executes code and makes requests first.
 
 Then a test expects that certain requests have or have not been made, 
 performs assertions against those requests, 

aio/content/guide/i18n.md

@@ -359,7 +359,7 @@ Pluralization categories include (depending on the language):
 After the pluralization category, put the default English text in braces (`{}`).
 
 In the example above, the three options are specified according to that pluralization pattern. For
-talking about zero minutes, you use `=0 {just now}`. For one minute, you use `=1 {one minute}`.
+talking about about zero minutes, you use `=0 {just now}`. For one minute, you use `=1 {one minute}`.
 Any unmatched cardinality uses `other {{{minutes}} minutes ago}`. You could choose to add patterns
 for two, three, or any other number if the pluralization rules were different. For the example of
 "minute", only these three patterns are necessary in English.
@@ -542,7 +542,7 @@ This sample file is easy to translate without a special editor or knowledge of F
 
 
 2. Duplicate the `<source/>` tag, rename it `target`, and then replace its content with the French
-  greeting. If you were working with a more complex translation, you could use the information
+  greeting. If you were working with a more complex translation, you could use the the information
   and context provided by the source, description, and meaning elements to guide your selection of
   the appropriate French translation.
 

aio/content/guide/observables.md

@@ -1,4 +1,3 @@
-
 # Observables
 
 Observables provide support for passing messages between publishers and subscribers in your application. Observables offer significant benefits over other techniques for event handling, asynchronous programming, and handling multiple values.
@@ -37,10 +36,10 @@ An `Observable` instance begins publishing values only when someone subscribes t
 
 <div class="alert is-helpful">
 
-In order to show how subscribing works, we need to create a new observable. There is a constructor that you use to create new instances, but for illustration, we can use some methods from the RxJS library that create simple observables of frequently used types:
+   In order to show how subscribing works, we need to create a new observable. There is a  constructor that you use to create new instances, but for illustration, we can use some static methods on the `Observable` class that create simple observables of frequently used types:
 
-  * `of(...items)`&mdash;Returns an `Observable` instance that synchronously delivers the values provided as arguments.
-  * `from(iterable)`&mdash;Converts its argument to an `Observable` instance. This method is commonly used to convert an array to an observable.
+  * `Observable.of(...items)`&mdash;Returns an `Observable` instance that synchronously delivers the values provided as arguments.
+  * `Observable.from(iterable)`&mdash;Converts its argument to an `Observable` instance. This method is commonly used to convert an array to an observable.
 
 </div>
 
@@ -63,7 +62,7 @@ Note that a `next()` function could receive, for instance, message strings, or e
 
 Use the `Observable` constructor to create an observable stream of any type. The constructor takes as its argument the subscriber function to run when the observable’s `subscribe()` method executes. A subscriber function receives an `Observer` object, and can publish values to the observer's `next()` method.
 
-For example, to create an observable equivalent to the `of(1, 2, 3)` above, you could do something like this:
+For example, to create an observable equivalent to the `Observable.of(1, 2, 3)` above, you could do something like this:
 
 <code-example path="observables/src/creating.ts" region="subscriber" title="Create observable with constructor"></code-example>
 

aio/content/guide/quickstart.md

@@ -1,4 +1,4 @@
-# Getting Started
+# QuickStart
 
 Good tools make application development quicker and easier to maintain than
 if you did everything by hand.
@@ -147,7 +147,7 @@ Open `src/app/app.component.css` and give the component some style.
 
 
 <figure>
-  <img src='generated/images/guide/cli-quickstart/my-first-app.png' alt="Output of Getting Started app">
+  <img src='generated/images/guide/cli-quickstart/my-first-app.png' alt="Output of QuickStart app">
 </figure>
 
 

aio/content/guide/releases.md

@@ -70,7 +70,7 @@ The following table contains our current target release dates for the next two m
  September/October 2018 | 7.0.0          | ^6.0.0
  March/April 2019       | 8.0.0          | ^7.0.0
 
- Compatibility note: The primary goal of the backward compatibility promise is to ensure that changes in the core framework and tooling don't break the existing ecosystem of components and applications and don't put undue upgrade/migration burden on Angular application and component authors.
+ Compatiblity note: The primary goal of the backwards compatibility promise is to ensure that changes in the core framework and tooling don't break the existing ecosystem of components and applications and don't put undue upgrade/migration burden on Angular application and component authors.
 
 
 {@a lts}

aio/content/guide/router.md

@@ -3918,7 +3918,7 @@ the `queryParamsHandling` and `preserveFragment` bindings respectively.
 
 As you've worked through the milestones, the application has naturally gotten larger.
 As you continue to build out feature areas, the overall application size will continue to grow.
-At some point you'll reach a tipping point where the application takes a long time to load.
+At some point you'll reach a tipping point where the application takes long time to load.
 
 How do you combat this problem?  With asynchronous routing, which loads feature modules _lazily_, on request.
 Lazy loading has multiple benefits.

aio/content/guide/setup.md

@@ -330,7 +330,7 @@ You may need [nvm](https://github.com/creationix/nvm) if you already have projec
 Links on almost every documentation page open completed samples in the browser.
 You can play with the sample code, share your changes with friends, and download and run the code on your own machine.
 
-The [Getting Started](guide/quickstart "Angular QuickStart Playground") shows just the `AppComponent` file.
+The [QuickStart](guide/quickstart "Angular QuickStart Playground") shows just the `AppComponent` file.
 It creates the equivalent of `app.module.ts` and `main.ts` internally _for the playground only_.
 so the reader can discover Angular without distraction.
 The other samples are based on the QuickStart seed.
@@ -356,24 +356,3 @@ If you develop angular locally with `ng serve`, there will be `websocket` connec
 
 In windows, by default one application can only have 6 websocket connections, <a href="https://msdn.microsoft.com/library/ee330736%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396#websocket_maxconn" title="MSDN WebSocket settings">MSDN WebSocket Settings</a>.
 So if IE was refreshed manunally or automatically by `ng serve`, sometimes, the websocket will not close properly, when websocket connections exceed limitations, `SecurityError` will be thrown, this error will not affect the angular application, you can just restart IE to clear this error, or modify the windows registry to update the limitations.
-
-## Appendix: test using `fakeAsync()/async()`
-
-If you use the `fakeAsync()/async()` helper function to run unit tests (for details, read [testing guide](guide/testing#async-test-with-fakeasync)), you need to import `zone.js/dist/zone-testing` in your test setup file.
-
-<div class="alert is-important">
-If you create project with `Angular/CLI`, it is already imported in `src/test.ts`.
-</div>
-
-And in the earlier versions of `Angular`, the following files were imported or added in your html file:
-
-```
-import 'zone.js/dist/long-stack-trace-zone';
-import 'zone.js/dist/proxy';
-import 'zone.js/dist/sync-test';
-import 'zone.js/dist/jasmine-patch';
-import 'zone.js/dist/async-test';
-import 'zone.js/dist/fake-async-test';
-```
-
-You can still load those files separately, but the order is important, you must import `proxy` before `sync-test`, `async-test`, `fake-async-test` and `jasmine-patch`. And you also need to import `sync-test` before `jasmine-patch`, so it is recommended to just import `zone-testing` instead of loading those separated files.

aio/content/guide/styleguide.md

@@ -45,7 +45,7 @@ If you fully understand the meaning behind the guideline and have a good reason
 
 
 
-**Avoid** indicates something you should almost never do. Code examples to *avoid* have an unmistakable red header.
+**Avoid** indicates something you should almost never do. Code examples to *avoid* have an unmistakeable red header.
 
 
 </div>
@@ -2865,7 +2865,7 @@ and more difficult in a flat structure.
 
 
 
-**Why?** NgModules make it easier to isolate, test, and reuse features.
+**Why?** NgModules make it easier to isolate, test, and re-use features.
 
 
 </div>

aio/content/guide/testing.md

@@ -1054,8 +1054,6 @@ value becomes available. The test must become _asynchronous_.
 
 #### Async test with _fakeAsync()_
 
-To use `fakeAsync()` functionality, you need to import `zone-testing`, for details, please read [setup guide](guide/setup#appendix-test-using-fakeasyncasync).
-
 The following test confirms the expected behavior when the service returns an `ErrorObservable`.
 
 <code-example
@@ -1069,7 +1067,7 @@ Note that the `it()` function receives an argument of the following form.
 fakeAsync(() => { /* test body */ })`
 ```
 
-The `fakeAsync()` function enables a linear coding style by running the test body in a special `fakeAsync test zone`.
+The `fakeAsync` function enables a linear coding style by running the test body in a special _fakeAsync test zone_.
 The test body appears to be synchronous.
 There is no nested syntax (like a `Promise.then()`) to disrupt the flow of control.
 
@@ -1082,55 +1080,12 @@ You do have to call `tick()` to advance the (virtual) clock.
 Calling `tick()` simulates the passage of time until all pending asynchronous activities finish.
 In this case, it waits for the error handler's `setTimeout()`;
 
-The `tick()` function accepts milliseconds as parameter (defaults to 0 if not provided). The parameter represents how much the virtual clock advances. For example, if you have a `setTimeout(fn, 100)` in a `fakeAsync()` test, you need to use tick(100) to trigger the fn callback.
-
-<code-example
-  path="testing/src/app/demo/async-helper.spec.ts"
-  region="fake-async-test-tick">
-</code-example>
-
-The `tick()` function is one of the Angular testing utilities that you import with `TestBed`.
-It's a companion to `fakeAsync()` and you can only call it within a `fakeAsync()` body.
-
-#### Comparing dates inside fakeAsync()
-
-`fakeAsync()` simulates passage of time, which allows you to calculate the difference between dates inside `fakeAsync()`.
-
-<code-example
-  path="testing/src/app/demo/async-helper.spec.ts"
-  region="fake-async-test-date">
-</code-example>
-
-#### jasmine.clock with fakeAsync()
-
-Jasmine also provides a `clock` feature to mock dates. Angular automatically runs tests that are run after
-`jasmine.clock().install()` is called inside a `fakeAsync()` method until `jasmine.clock().uninstall()` is called. `fakeAsync()` is not needed and throws an error if nested.
-
-By default, this feature is disabled. To enable it, set a global flag before import `zone-testing`.
-
-If you use the Angular CLI, configure this flag in `src/test.ts`.
-
-```
-(window as any)['__zone_symbol__fakeAsyncPatchLock'] = true;
-import 'zone.js/dist/zone-testing';
-```
-
-<code-example
-  path="testing/src/app/demo/async-helper.spec.ts"
-  region="fake-async-test-clock">
-</code-example>
-
-#### Using the RxJS scheduler inside fakeAsync()
-
-You can also use RxJS scheduler in `fakeAsync()` just like using `setTimeout()` or `setInterval()`, but you need to import `zone.js/dist/zone-patch-rxjs-fake-async` to patch RxJS scheduler.
-<code-example
-  path="testing/src/app/demo/async-helper.spec.ts"
-  region="fake-async-test-rxjs">
-</code-example>
+The `tick` function is one of the Angular testing utilities that you import with `TestBed`.
+It's a companion to `fakeAsync` and you can only call it within a `fakeAsync` body.
 
 #### Support more macroTasks
 
-By default `fakeAsync()` supports the following `macroTasks`.
+By default `fakeAsync` supports the following `macroTasks`.
 
 - setTimeout
 - setInterval
@@ -1151,7 +1106,7 @@ If you run other `macroTask` such as `HTMLCanvasElement.toBlob()`, `Unknown macr
   </code-pane>
 </code-tabs>
 
-If you want to support such case, you need to define the `macroTask` you want to support in `beforeEach()`.
+If you want to support such case, you need to define the `macroTask` you want to support in `beforeEach`.
 For example:
 
 ```javascript
@@ -1248,8 +1203,6 @@ Then you can assert that the quote element displays the expected text.
 
 #### Async test with _async()_
 
-To use `async()` functionality, you need to import `zone-testing`, for details, please read [setup guide](guide/setup#appendix-test-using-fakeasyncasync).
-
 The `fakeAsync()` utility function has a few limitations.
 In particular, it won't work if the test body makes an `XHR` call.
 
@@ -1273,13 +1226,12 @@ Here's the previous `fakeAsync()` test, re-written with the `async()` utility.
 
 The `async()` utility hides some asynchronous boilerplate by arranging for the tester's code
 to run in a special _async test zone_.
-You don't need to pass Jasmine's `done()` into the test and call `done()` because it is `undefined` in promise or observable callbacks.
+You don't have to pass Jasmine's `done()` into the test and call `done()`
+in promise or observable callbacks.
 
 But the test's asynchronous nature is revealed by the call to `fixture.whenStable()`,
 which breaks the linear flow of control.
 
-When using an `intervalTimer()` such as `setInterval()` in `async()`, remember to cancel the timer with `clearInterval()` after the test, otherwise the `async()` never ends.
-
 {@a when-stable}
 
 #### _whenStable_
@@ -1298,19 +1250,18 @@ update the quote element with the expected text.
 
 #### Jasmine _done()_
 
-While the `async()` and `fakeAsync()` functions greatly
+While the `async` and `fakeAsync` functions greatly
 simplify Angular asynchronous testing,
 you can still fall back to the traditional technique
 and pass `it` a function that takes a
 [`done` callback](http://jasmine.github.io/2.0/introduction.html#section-Asynchronous_Support).
 
-You can't call `done()` in `async()` or `fakeAsync()` functions, because the `done parameter`
-is `undefined`.
-
 Now you are responsible for chaining promises, handling errors, and calling `done()` at the appropriate moments.
 
-Writing test functions with `done()`, is more cumbersome than `async()`and `fakeAsync()`.
-But it is occasionally necessary when code involves the `intervalTimer()` like `setInterval`.
+Writing test functions with `done()`, is more cumbersome than `async`and `fakeAsync`.
+But it is occasionally necessary.
+For example, you can't call `async` or `fakeAsync` when testing
+code that involves the `intervalTimer()` or the RxJS `delay()` operator.
 
 Here are two more versions of the previous test, written with `done()`.
 The first one subscribes to the `Observable` exposed to the template by the component's `quote` property.
@@ -2173,6 +2124,7 @@ Here are a few more `HeroDetailComponent` tests to reinforce the point.
 
 {@a compile-components}
 ### Calling _compileComponents()_
+
 <div class="alert is-helpful">
 
 You can ignore this section if you _only_ run tests with the CLI `ng test` command
@@ -2736,7 +2688,7 @@ Here's a summary of the stand-alone functions, in order of likely utility:
 
     <td>
 
-      When a `fakeAsync()` test ends with pending timer event _tasks_ (queued `setTimeOut` and `setInterval` callbacks),
+      When a `fakeAsync` test ends with pending timer event _tasks_ (queued `setTimeOut` and `setInterval` callbacks),
       the test fails with a clear error message.
 
       In general, a test should end with no queued tasks.
@@ -2753,7 +2705,7 @@ Here's a summary of the stand-alone functions, in order of likely utility:
 
     <td>
 
-      When a `fakeAsync()` test ends with pending _micro-tasks_ such as unresolved promises,
+      When a `fakeAsync` test ends with pending _micro-tasks_ such as unresolved promises,
       the test fails with a clear error message.
 
       In general, a test should wait for micro-tasks to finish.

aio/content/guide/transition-and-triggers.md

@@ -255,7 +255,7 @@ You can combine keyframes with `duration`, `delay`, and `easing` within a single
 
 ### Keyframes with a pulsation
 
-Use keyframes to create a pulse effect in your animations by defining styles at specific offset throughout the animation.
+Use ketframes to create a pulse effect in your animations by defining styles at specific offset throughout the animation.
 
 Here's an example of using keyframes to create a pulse effect:
 
@@ -305,4 +305,4 @@ You may also be interested in the following:
 * [Introduction to Angular animations](guide/animations)
 * [Complex animation sequences](guide/complex-animation-sequences)
 * [Reusable animations](guide/reusable-animations)
-* [Route transition animations](guide/route-animations)
+* [Route transition animations](guide/route-animations)

aio/content/marketing/contributors.json

@@ -671,14 +671,5 @@
     "website": "https://sajeetharan.herokuapp.com/",
     "bio": "Sajeetharan is a Developer, Top contributor on stackoverflow for #Angular, ng-SriLanka organizer. He makes use of his extensive knowledge over the past years to contribute to community to make the world a better place.",
     "group": "GDE"
-  },
-
-  "lacolaco": {
-    "name": "Suguru Inatomi",
-    "picture": "lacolaco.jpg",
-    "twitter": "laco2net",
-    "website": "https://lacolaco.net",
-    "bio": "Suguru is a community-loving Frontend developer and a lead of Angular Japan User Group. He organizes the largest Angular event in Japan (ng-japan). And he is a contributor to Angular by sending patches, writing, speaking, and localizing resources in Japanese.",
-    "group": "GDE"
   }
 }

aio/content/marketing/docs.md

@@ -10,9 +10,9 @@ Angular is a platform that makes it easy to build applications with the web. Ang
       <p class="card-footer">Angular in Action</p>
   </a>
 
-  <a href="guide/quickstart" class="docs-card" title="Angular Getting Started">
+  <a href="guide/quickstart" class="docs-card" title="Angular Quickstart">
       <section>Get Going with Angular</section>
-      <p>Get going on your own environment with the Getting Started.</p>
+      <p>Get going on your own environment with the Quickstart.</p>
       <p class="card-footer">Quickstart</p>
   </a>
 

aio/content/marketing/events.html

@@ -13,12 +13,6 @@
     </tr>
     </thead>
     <tbody>
-    <!-- AngularMix -->
-    <tr>
-        <th><a href="https://angularmix.com/" title="AngularMix">AngularMix</a></th>
-        <td>Orlando, Florida</td>
-        <td>October 10-12, 2018</td>
-    </tr>
     <!-- ReactiveConf -->
     <tr>
       <th><a href="https://reactiveconf.com/" title="ReactiveConf">ReactiveConf</a></th>
@@ -65,13 +59,13 @@
     <!-- ngconf 2018-->
     <tr>
       <th><a href="https://www.ng-conf.org/" title="ng-conf">ng-conf</a></th>
-      <td>Salt Lake City, Utah</td>
+      <td>Salt Lake City, UT</td>
       <td>April 18-20, 2018</td>
     </tr>
     <!-- WeRDevs-->
     <tr>
       <th><a href="https://www.wearedevelopers.com/" title="WeAreDevs">WeAreDevelopers</a></th>
-      <td>Vienna, Austria</td>
+      <td>Vienna</td>
       <td>May 16-18, 2018</td>
     </tr>
     <!-- ngJapan-->

aio/content/navigation.json

@@ -592,6 +592,17 @@
       "tooltip": "Details of the Angular classes and values.",
       "url": "api"
     },
+    {
+      "title": "CLI Commands",
+      "tooltip": "Angular CLI command reference.",
+      "children": [
+        {
+          "title": "Using the CLI",
+          "tooltip": "An overview of how to use the CLI tool",
+          "url": "cli"
+        }
+      ]
+    },
     {
       "url": "guide/change-log",
       "title": "Change Log",

aio/package.json

@@ -18,19 +18,20 @@
     "build-for": "yarn ~~build --configuration",
     "prebuild-local": "yarn setup-local",
     "build-local": "yarn ~~build --configuration=stable",
+    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js",
     "lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
     "test": "yarn check-env && ng test",
     "pree2e": "yarn check-env && yarn update-webdriver",
     "e2e": "ng e2e --no-webdriver-update",
     "presetup": "yarn --cwd .. install && yarn install --frozen-lockfile && yarn ~~check-env && yarn ~~clean-generated && yarn boilerplate:remove",
     "setup": "yarn aio-use-npm && yarn example-use-npm",
-    "postsetup": "yarn boilerplate:add && yarn build-ie-polyfills && yarn docs",
+    "postsetup": "yarn boilerplate:add && yarn build-ie-polyfills && yarn extract-cli-command-docs && yarn docs",
     "presetup-local": "yarn presetup",
     "setup-local": "yarn aio-use-local && yarn example-use-local",
     "postsetup-local": "yarn postsetup",
     "set-opensearch-url": "node --eval \"const sh = require('shelljs'); sh.set('-e'); sh.sed('-i', /PLACEHOLDER_URL/g, process.argv[1], 'dist/assets/opensearch.xml');\"",
+    "test-pwa-score-localhost": "concurrently --kill-others --success first \"http-server dist -p 4200 --silent\" \"yarn test-pwa-score http://localhost:4200 90\"",
     "test-pwa-score": "node scripts/test-pwa-score",
-    "test-pwa-score-localhost": "run-p --race \"~~http-server dist -p 4200 --silent\" \"test-pwa-score http://localhost:4200 {1} {2}\" --",
     "example-e2e": "yarn example-check-local && node ./tools/examples/run-example-e2e",
     "example-lint": "tslint -c \"content/examples/tslint.json\" \"content/examples/**/*.ts\" -e \"content/examples/styleguide/**/*.avoid.ts\"",
     "example-use-local": "node tools/ng-packages-installer overwrite ./tools/examples/shared --debug",
@@ -41,7 +42,8 @@
     "postcheck-env": "yarn aio-check-local",
     "payload-size": "scripts/payload.sh",
     "predocs": "yarn generate-stackblitz && yarn generate-zips",
-    "docs": "dgeni ./tools/transforms/angular.io-package",
+    "docs": "yarn docs-only",
+    "docs-only": "dgeni ./tools/transforms/angular.io-package",
     "docs-watch": "node tools/transforms/authors-package/watchr.js",
     "docs-lint": "eslint --ignore-path=\"tools/transforms/.eslintignore\" tools/transforms",
     "docs-test": "node tools/transforms/test.js",
@@ -50,7 +52,7 @@
     "tools-lint": "tslint -c \"tools/tslint.json\" \"tools/firebase-test-utils/**/*.ts\"",
     "tools-test": "./scripts/deploy-to-firebase.test.sh && yarn docs-test && yarn boilerplate:test && jasmine tools/ng-packages-installer/index.spec.js && yarn firebase-utils-test",
     "preserve-and-sync": "yarn docs",
-    "serve-and-sync": "run-p \"start\" \"docs-watch --watch-only\"",
+    "serve-and-sync": "concurrently --kill-others \"yarn docs-watch --watch-only\" \"yarn start\"",
     "boilerplate:add": "node ./tools/examples/example-boilerplate add",
     "boilerplate:remove": "node ./tools/examples/example-boilerplate remove",
     "boilerplate:test": "node tools/examples/test.js",
@@ -62,8 +64,7 @@
     "~~check-env": "node scripts/check-environment",
     "~~clean-generated": "node --eval \"require('shelljs').rm('-rf', 'src/generated')\"",
     "~~build": "ng build",
-    "post~~build": "yarn build-404-page",
-    "~~http-server": "http-server"
+    "post~~build": "yarn build-404-page"
   },
   "engines": {
     "node": ">=10.9.0 <11.0.0",
@@ -71,17 +72,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^7.0.0-rc.1",
-    "@angular/cdk": "7.0.0-rc.1",
-    "@angular/common": "^7.0.0-rc.1",
-    "@angular/core": "^7.0.0-rc.1",
-    "@angular/elements": "^7.0.0-rc.1",
-    "@angular/forms": "^7.0.0-rc.1",
-    "@angular/material": "7.0.0-rc.1",
-    "@angular/platform-browser": "^7.0.0-rc.1",
-    "@angular/platform-browser-dynamic": "^7.0.0-rc.1",
-    "@angular/router": "^7.0.0-rc.1",
-    "@angular/service-worker": "^7.0.0-rc.1",
+    "@angular/animations": "6.1.0-rc.3",
+    "@angular/cdk": "6.0.2",
+    "@angular/common": "6.1.0-rc.3",
+    "@angular/core": "6.1.0-rc.3",
+    "@angular/elements": "6.1.0-rc.3",
+    "@angular/forms": "6.1.0-rc.3",
+    "@angular/material": "6.0.2",
+    "@angular/platform-browser": "6.1.0-rc.3",
+    "@angular/platform-browser-dynamic": "6.1.0-rc.3",
+    "@angular/router": "6.1.0-rc.3",
+    "@angular/service-worker": "6.1.0-rc.3",
     "@webcomponents/custom-elements": "^1.2.0",
     "classlist.js": "^1.1.20150312",
     "core-js": "^2.4.1",
@@ -91,20 +92,20 @@
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.9.0-rc.1",
-    "@angular/cli": "^7.0.0-rc.2",
-    "@angular/compiler": "^7.0.0-rc.1",
-    "@angular/compiler-cli": "^7.0.0-rc.1",
-    "@angular/language-service": "^7.0.0-rc.1",
+    "@angular-devkit/build-angular": "0.6.7",
+    "@angular/cli": "^6.1.0-rc.3",
+    "@angular/compiler": "6.1.0-rc.3",
+    "@angular/compiler-cli": "6.1.0-rc.3",
+    "@angular/language-service": "6.1.0-rc.3",
     "@types/jasmine": "^2.5.52",
-    "@types/jasminewd2": "^2.0.4",
+    "@types/jasminewd2": "^2.0.3",
     "@types/node": "~6.0.60",
-    "@yarnpkg/lockfile": "^1.1.0",
     "archiver": "^1.3.0",
     "canonical-path": "^0.0.2",
     "chalk": "^2.1.0",
     "cjson": "^0.5.0",
     "codelyzer": "~4.2.1",
+    "concurrently": "^3.4.0",
     "cross-spawn": "^5.1.0",
     "css-selector-parser": "^1.3.0",
     "dgeni": "^0.4.7",
@@ -112,7 +113,7 @@
     "entities": "^1.1.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jasmine": "^2.2.0",
-    "firebase-tools": "^5.1.1",
+    "firebase-tools": "^3.2.1",
     "fs-extra": "^2.1.2",
     "globby": "^6.1.0",
     "hast-util-is-element": "^1.0.0",
@@ -127,16 +128,17 @@
     "jasmine-spec-reporter": "^4.1.0",
     "jasmine-ts": "^0.2.1",
     "jsdom": "^9.12.0",
+    "json-schema-traverse": "^0.4.1",
+    "json5": "^1.0.1",
     "karma": "^1.7.0",
     "karma-chrome-launcher": "^2.1.1",
     "karma-cli": "^1.0.1",
     "karma-coverage-istanbul-reporter": "^1.3.0",
     "karma-jasmine": "^1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "lighthouse": "^3.2.1",
+    "lighthouse": "^2.5.0",
     "lodash": "^4.17.4",
     "lunr": "^2.1.0",
-    "npm-run-all": "^4.1.5",
     "protractor": "^5.2.0",
     "rehype": "^4.0.0",
     "rehype-slug": "^2.0.0",
@@ -148,7 +150,7 @@
     "tree-kill": "^1.1.0",
     "ts-node": "^3.3.0",
     "tslint": "~5.9.1",
-    "typescript": "^3.1.2",
+    "typescript": "^2.9.2",
     "uglify-js": "^3.0.15",
     "unist-util-filter": "^0.2.1",
     "unist-util-source": "^1.0.1",
@@ -156,7 +158,7 @@
     "unist-util-visit-parents": "^1.1.1",
     "vrsource-tslint-rules": "^5.8.2",
     "watchr": "^3.0.1",
-    "webpack-cli": "^3.1.2",
+    "webpack-cli": "^2.0.14",
     "xregexp": "^4.0.0",
     "yargs": "^7.0.2"
   }

aio/scripts/_payload-limits.json

@@ -2,10 +2,10 @@
   "aio": {
     "master": {
       "uncompressed": {
-        "runtime": 3173,
-        "main": 494475,
-        "polyfills": 53926,
-        "prettify": 14917
+        "runtime": 2768,
+        "main": 476338,
+        "polyfills": 53922,
+        "prettify": 14913
       }
     }
   }

aio/scripts/deploy-to-firebase.sh

@@ -100,9 +100,9 @@ fi
   yarn payload-size
 
   # Deploy to Firebase
-  yarn firebase use "$projectId" --token "$firebaseToken"
-  yarn firebase deploy --message "Commit: $TRAVIS_COMMIT" --non-interactive --token "$firebaseToken"
+  firebase use "$projectId" --token "$firebaseToken"
+  firebase deploy --message "Commit: $TRAVIS_COMMIT" --non-interactive --token "$firebaseToken"
 
   # Run PWA-score tests
-  yarn test-pwa-score "$deployedUrl" "$AIO_MIN_PWA_SCORE"
+  yarn test-pwa-score "$deployedUrl" "$MIN_PWA_SCORE"
 )

aio/scripts/test-preview.js

@@ -1,121 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Usage:
- *   node scripts/test-preview <pr-number> <pr-last-sha> <min-pwa-score>
- *
- * Checks whether a PR will (eventually) have a (public) preview, waits for the preview to be
- * available, and runs PWA tests against the preview.
- *
- * For PRs that are expected to have a preview, this script will fail if the preview is still not
- * available after a pre-defined waiting period or if the PWA tests fail.
- */
-
-// Imports
-const {spawn} = require('child_process');
-const {get: httpsGet} = require('https');
-const {relative} = require('path');
-
-// Input
-const [prNumber, prLastSha, minPwaScore] = validateArgs(process.argv.slice(2));
-
-// Variables
-const aioBuildsDomain = 'ngbuilds.io';
-const previewCheckInterval = 30000;
-const previewCheckAttempts = 10;
-
-const shortSha = prLastSha && prLastSha.slice(0, 7);
-const previewabilityCheckUrl = `https://${aioBuildsDomain}/can-have-public-preview/${prNumber}`;
-const previewUrl = `https://pr${prNumber}-${shortSha}.${aioBuildsDomain}/`;
-
-// Check whether the PR can have a (public) preview.
-get(previewabilityCheckUrl).
-  then(response => JSON.parse(response)).
-  then(({canHavePublicPreview, reason}) => {
-    // Nothing to do, if this PR can have no (public) preview.
-    if (canHavePublicPreview === false) {
-      reportNoPreview(reason);
-      return;
-    }
-
-    // There should be a preview. Wait for it to be available.
-    return poll(previewCheckInterval, previewCheckAttempts, () => get(previewUrl)).
-      // The preview is still not available after the specified waiting period.
-      catch(() => {
-        const totalSecs = Math.round((previewCheckInterval * previewCheckAttempts) / 1000);
-        throw new Error(`Preview still not available after ${totalSecs}s.`);
-      }).
-      // The preview is now available. Run the PWA tests.
-      then(() => runPwaTests());
-  }).
-  catch(onError);
-
-// Helpers
-function get(url) {
-  console.log(`GET ${url}`);
-  return new Promise((resolve, reject) => {
-    const onResponse = res => {
-      const statusCode = res.statusCode || -1;
-      const isSuccess = (200 <= statusCode) && (statusCode < 400);
-      let responseText = '';
-
-      res.
-        on('error', reject).
-        on('data', d => responseText += d).
-        on('end', () => isSuccess ?
-          resolve(responseText) :
-          reject(`Request to '${url}' failed (status: ${statusCode}): ${responseText}`));
-    };
-
-    httpsGet(url, onResponse).
-      on('error', reject);
-  });
-}
-
-function onError(err) {
-  console.error(err);
-  process.exit(1);
-}
-
-function poll(interval, attempts, checkCondition) {
-  return new Promise((resolve, reject) => {
-    if (!attempts) return reject();
-
-    checkCondition().
-      then(() => resolve()).
-      catch(() => wait(interval).
-        then(() => poll(interval, attempts - 1, checkCondition)).
-        then(resolve, reject));
-  });
-}
-
-function reportNoPreview(reason) {
-  console.log(`No (public) preview available. (Reason: ${reason})`);
-}
-
-function runPwaTests() {
-  return new Promise((resolve, reject) => {
-    const spawnOptions = {cwd: __dirname, stdio: 'inherit'};
-    spawn('yarn', ['test-pwa-score', previewUrl, minPwaScore], spawnOptions).
-      on('error', reject).
-      on('exit', code => (code === 0 ? resolve : reject)());
-  });
-}
-
-function validateArgs(args) {
-  if (args.length !== 3) {
-    const relativeScriptPath = relative('.', __filename.replace(/\.js$/, ''));
-    const usageCmd = `node ${relativeScriptPath} <pr-number> <pr-last-sha> <min-pwa-score>`;
-
-    return onError(
-      `Invalid number of arguments (expected 3, found ${args.length}).\n` +
-      `Usage: ${usageCmd}`);
-  }
-
-  return args;
-}
-
-function wait(delay) {
-  console.log(`Waiting ${delay}ms...`);
-  return new Promise(resolve => setTimeout(resolve, delay));
-}

aio/scripts/test-production.sh

@@ -6,7 +6,7 @@ set +x -eu -o pipefail
   readonly aioDir="$(realpath $thisDir/..)"
 
   readonly protractorConf="$aioDir/tests/deployment/e2e/protractor.conf.js"
-  readonly minPwaScore="$1"
+  readonly minPwaScore="95"
   readonly urls=(
     "https://angular.io/"
     "https://next.angular.io/"

aio/scripts/test-pwa-score.js

@@ -11,15 +11,13 @@
  */
 
 // Imports
-const chromeLauncher = require('chrome-launcher');
 const lighthouse = require('lighthouse');
+const chromeLauncher = require('lighthouse/chrome-launcher');
 const printer = require('lighthouse/lighthouse-cli/printer');
-const config = require('lighthouse/lighthouse-core/config/default-config.js');
-const logger = require('lighthouse-logger');
+const config = require('lighthouse/lighthouse-core/config/default.js');
 
 // Constants
 const CHROME_LAUNCH_OPTS = {};
-const LIGHTHOUSE_FLAGS = {logLevel: 'info'};
 const SKIPPED_HTTPS_AUDITS = ['redirects-http'];
 const VIEWER_URL = 'https://googlechrome.github.io/lighthouse/viewer/';
 
@@ -28,7 +26,6 @@ const VIEWER_URL = 'https://googlechrome.github.io/lighthouse/viewer/';
 if (process.env.TRAVIS) {
   process.env.LIGHTHOUSE_CHROMIUM_PATH = process.env.CHROME_BIN;
   CHROME_LAUNCH_OPTS.chromeFlags = ['--no-sandbox'];
-  LIGHTHOUSE_FLAGS.logLevel = 'error';
 }
 
 // Run
@@ -45,20 +42,18 @@ function _main(args) {
     skipHttpsAudits(config);
   }
 
-  logger.setLevel(LIGHTHOUSE_FLAGS.logLevel);
-
-  launchChromeAndRunLighthouse(url, LIGHTHOUSE_FLAGS, config).
+  launchChromeAndRunLighthouse(url, {}, config).
     then(results => processResults(results, logFile)).
     then(score => evaluateScore(minScore, score)).
     catch(onError);
 }
 
 function evaluateScore(expectedScore, actualScore) {
-  console.log('\nLighthouse PWA score:');
-  console.log(`  - Expected: ${expectedScore.toFixed(0).padStart(3)} / 100 (or higher)`);
-  console.log(`  - Actual:   ${actualScore.toFixed(0).padStart(3)} / 100\n`);
+  console.log('Lighthouse PWA score:');
+  console.log(`  - Expected: ${expectedScore} / 100 (or higher)`);
+  console.log(`  - Actual:   ${actualScore} / 100`);
 
-  if (isNaN(actualScore) || (actualScore < expectedScore)) {
+  if (actualScore < expectedScore) {
     throw new Error(`PWA score is too low. (${actualScore} < ${expectedScore})`);
   }
 }
@@ -92,30 +87,20 @@ function parseInput(args) {
 }
 
 function processResults(results, logFile) {
-  const categories = results.lhr.categories;
-  const report = results.report;
+  let promise = Promise.resolve();
 
-  return Promise.resolve().
-    then(() => {
-      if (logFile) {
-        console.log(`Saving results in '${logFile}'...`);
-        console.log(`(LightHouse viewer: ${VIEWER_URL})`);
+  if (logFile) {
+    console.log(`Saving results in '${logFile}'...`);
+    console.log(`(LightHouse viewer: ${VIEWER_URL})`);
 
-        return printer.write(report, printer.OutputMode.json, logFile);
-      }
-    }).
-    then(() => {
-      const categoryData = Object.keys(categories).map(name => categories[name]);
-      const maxTitleLen = Math.max(...categoryData.map(({title}) => title.length));
+    // Remove the artifacts, which are not necessary for the report.
+    // (Saves ~1,500,000 lines of formatted JSON output \o/)
+    results.artifacts = undefined;
 
-      console.log('\nAudit scores:');
-      categoryData.forEach(({title, score}) => {
-        const paddedTitle = `${title}:`.padEnd(maxTitleLen + 1);
-        const paddedScore = (score * 100).toFixed(0).padStart(3);
-        console.log(`  - ${paddedTitle} ${paddedScore} / 100`);
-      });
-    }).
-    then(() => categories.pwa.score * 100);
+    promise = printer.write(results, 'json', logFile);
+  }
+
+  return promise.then(() => Math.round(results.score));
 }
 
 function skipHttpsAudits(config) {

aio/src/app/app.component.spec.ts

@@ -164,10 +164,10 @@ describe('AppComponent', () => {
 
     describe('onScroll', () => {
       it('should update `tocMaxHeight` accordingly', () => {
-        component.tocMaxHeight = '';
-        component.onScroll();
+        expect(component.tocMaxHeight).toBeUndefined();
 
-        expect(component.tocMaxHeight).toMatch(/^\d+\.\d{2}$/);
+        component.onScroll();
+        expect(component.tocMaxHeight).toBeGreaterThan(0);
       });
     });
 
@@ -654,13 +654,12 @@ describe('AppComponent', () => {
       it('should update the TOC container\'s `maxHeight` based on `tocMaxHeight`', () => {
         setHasFloatingToc(true);
 
+        expect(tocContainer!.style['max-height']).toBe('');
+
         component.tocMaxHeight = '100';
         fixture.detectChanges();
-        expect(tocContainer!.style['max-height']).toBe('100px');
 
-        component.tocMaxHeight = '200';
-        fixture.detectChanges();
-        expect(tocContainer!.style['max-height']).toBe('200px');
+        expect(tocContainer!.style['max-height']).toBe('100px');
       });
 
       it('should restrain scrolling inside the ToC container', () => {

aio/src/app/app.component.ts

@@ -349,17 +349,12 @@ export class AppComponent implements OnInit {
   @HostListener('window:scroll')
   onScroll() {
     if (!this.tocMaxHeightOffset) {
-      // Must wait until `mat-toolbar` is measurable.
+      // Must wait until now for mat-toolbar to be measurable.
       const el = this.hostElement.nativeElement as Element;
-      const headerEl = el.querySelector('.app-toolbar');
-      const footerEl = el.querySelector('footer');
-
-      if (headerEl && footerEl) {
-        this.tocMaxHeightOffset =
-            headerEl.clientHeight +
-            footerEl.clientHeight +
-            24; //  fudge margin
-      }
+      this.tocMaxHeightOffset =
+          el.querySelector('footer')!.clientHeight +
+          el.querySelector('.app-toolbar')!.clientHeight +
+          24; //  fudge margin
     }
 
     this.tocMaxHeight = (document.body.scrollHeight - window.pageYOffset - this.tocMaxHeightOffset).toFixed(2);

aio/src/app/custom-elements/contributor/contributor.service.spec.ts

@@ -44,7 +44,7 @@ describe('ContributorService', () => {
     it('contributors observable should complete', () => {
       let completed = false;
       contribService.contributors.subscribe(undefined, undefined, () => completed = true);
-      expect(completed).toBe(true, 'observable completed');
+      expect(true).toBe(true, 'observable completed');
     });
 
     it('should reshape the contributor json to expected result', () => {

aio/src/app/custom-elements/resource/resource.service.spec.ts

@@ -44,7 +44,7 @@ describe('ResourceService', () => {
     it('categories observable should complete', () => {
       let completed = false;
       resourceService.categories.subscribe(undefined, undefined, () => completed = true);
-      expect(completed).toBe(true, 'observable completed');
+      expect(true).toBe(true, 'observable completed');
     });
 
     it('should reshape contributors.json to sorted category array', () => {

aio/src/app/custom-elements/toc/toc.component.spec.ts

@@ -138,6 +138,9 @@ describe('TocComponent', () => {
       });
 
       it('should have more than 4 displayed items', () => {
+        let tocList: TocItem[];
+        tocService.tocList.subscribe(v => tocList = v);
+
         expect(page.listItems.length).toBeGreaterThan(4);
       });
 

aio/src/app/documents/document.service.spec.ts

@@ -180,8 +180,10 @@ describe('DocumentService', () => {
 
   describe('computeMap', () => {
     it('should map the "empty" location to the correct document request', () => {
+      let latestDocument: DocumentContents;
       const { docService } = getServices();
-      docService.currentDocument.subscribe();
+
+      docService.currentDocument.subscribe(doc => latestDocument = doc);
 
       httpMock.expectOne(CONTENT_URL_PREFIX + 'index.json');
     });

aio/src/app/navigation/navigation.service.spec.ts

@@ -2,9 +2,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { Injector } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 
-import {
-  CurrentNodes, NavigationNode, navigationPath, NavigationService, NavigationViews, VersionInfo,
-} from 'app/navigation/navigation.service';
+import { CurrentNodes, NavigationService, NavigationViews, NavigationNode, VersionInfo } from 'app/navigation/navigation.service';
 import { LocationService } from 'app/shared/location.service';
 import { MockLocationService } from 'testing/location.service';
 
@@ -48,9 +46,10 @@ describe('NavigationService', () => {
     it('navigationViews observable should complete', () => {
       let completed = false;
       navService.navigationViews.subscribe(undefined, undefined, () => completed = true);
+      expect(true).toBe(true, 'observable completed');
 
-      httpMock.expectOne({method: 'get', url: navigationPath}).flush({});
-      expect(completed).toBe(true, 'observable completed');
+      // Stop `$httpMock.verify()` from complaining.
+      httpMock.expectOne({});
     });
 
     it('should return the same object to all subscribers', () => {

aio/src/app/navigation/navigation.service.ts

@@ -11,7 +11,7 @@ import { CONTENT_URL_PREFIX } from 'app/documents/document.service';
 import { CurrentNodes, NavigationNode, NavigationResponse, NavigationViews, VersionInfo } from './navigation.model';
 export { CurrentNodes, CurrentNode, NavigationNode, NavigationResponse, NavigationViews, VersionInfo } from './navigation.model';
 
-export const navigationPath = CONTENT_URL_PREFIX + 'navigation.json';
+const navigationPath = CONTENT_URL_PREFIX + 'navigation.json';
 
 @Injectable()
 export class NavigationService {
@@ -95,8 +95,11 @@ export class NavigationService {
       this.location.currentPath,
 
       (navMap, url) => {
-        const urlKey = url.startsWith('api/') ? 'api' : url;
-        return navMap.get(urlKey) || { '' : { view: '', url: urlKey, nodes: [] }};
+        const matchSpecialUrls = /^api|^cli/.exec(url);
+        if (matchSpecialUrls) {
+          url = matchSpecialUrls[0];
+        }
+        return navMap.get(url) || { '' : { view: '', url: url, nodes: [] }};
       })
       .pipe(publishReplay(1));
     (currentNodes as ConnectableObservable<CurrentNodes>).connect();

aio/src/app/shared/copier.service.ts

@@ -16,8 +16,7 @@ export class CopierService {
      * and makes a selection on it.
      */
     createFake(text: string) {
-      const docElem = document.documentElement!;
-      const isRTL = docElem.getAttribute('dir') === 'rtl';
+      const isRTL = document.documentElement.getAttribute('dir') === 'rtl';
 
       // Create a fake element to hold the contents to copy
       this.fakeElem = document.createElement('textarea');
@@ -35,7 +34,7 @@ export class CopierService {
       this.fakeElem.style[ isRTL ? 'right' : 'left' ] = '-9999px';
 
       // Move element to the same position vertically
-      const yPosition = window.pageYOffset || docElem.scrollTop;
+      const yPosition = window.pageYOffset || document.documentElement.scrollTop;
       this.fakeElem.style.top = yPosition + 'px';
 
       this.fakeElem.setAttribute('readonly', '');

aio/src/index.html

@@ -91,7 +91,7 @@
 
   <noscript>
     <div class="background-sky hero"></div>
-    <section id="intro" style="text-shadow: 1px 1px #1976d2;">
+    <section id="intro">
       <div class="hero-logo">
         <img src="assets/images/logos/angular/angular.svg" width="250" height="250">
       </div>
@@ -99,7 +99,7 @@
         <div class="hero-headline">One framework.<br>Mobile &amp; desktop.</div>
       </div>
     </section>
-    <h2 style="color: red; margin-top: 40px; position: relative; text-align: center; text-shadow: 1px 1px #fafafa;">
+    <h2 style="color: red; text-align: center; margin-top: -50px;">
       <b><i>This website requires JavaScript.</i></b>
     </h2>
   </noscript>

aio/src/styles/0-base/_typography.scss

@@ -135,17 +135,6 @@ th {
   text-align: left;
 }
 
-p > code, li > code, td > code, th > code {
-  font-family: $code-font;
-  font-size: 85%;
-  color: $darkgray;
-  letter-spacing: 0;
-  line-height: 1;
-  padding: 2px 0;
-  background-color: $backgroundgray;
-  border-radius: 4px;
-}
-
 code {
   font-family: $code-font;
   font-size: 90%;

aio/src/styles/1-layouts/_sidenav.scss

@@ -115,7 +115,6 @@ button.vertical-menu-item {
 }
 
 .heading-children.collapsed {
-  overflow: hidden;  // Needed to prevent unnecessary sidenav scrollbar.
   visibility: hidden;
   opacity: 0;
   max-height: 1px; // Must have measurement to transition height.

aio/src/styles/2-modules/_api-pages.scss

@@ -31,11 +31,6 @@
   }
 
   .method-table, .option-table, .list-table {
-    td > code {
-      background-color: inherit;
-      white-space: pre;
-    }
-
     .with-github-links {
       align-items: center;
       display: flex;
@@ -71,6 +66,23 @@
     font-weight: bold;
   }
 
+  .short-description {
+    margin: 6px 0 0 10px;
+  }
+
+  .properties-table {
+    font-size: 14px;
+
+    thead th {
+      &:nth-child(1) {
+        width: 20%;
+      }
+      &:nth-child(2) {
+        width: 20%;
+      }
+    }
+  }
+
   .parameters-table {
     margin-top: 0;
     font-size: 14px;
@@ -92,7 +104,7 @@
     }
   }
 
-  .from-constructor, .read-only-property, .write-only-property {
+  .from-constructor, .read-only-property {
     font-style: italic;
     color: $blue;
   }
@@ -101,29 +113,6 @@
     list-style: none;
     padding: 0;
   }
-
-  .selector-list, .inherited-members-list {
-    ul {
-      padding: 0;
-      li {
-        list-style: none;
-        margin-bottom: 12px;
-      }
-    }
-  }
-
-  .selector-list {
-    li, a {
-      font-weight: bold;
-      i {
-        font-weight: normal;
-      }
-    }
-  }
-
-  .member-name {
-    font-weight: bold;
-  }
 }
 
 .deprecated-api-item {

aio/src/styles/2-modules/_cli-pages.scss

@@ -0,0 +1,7 @@
+.cli-name, .cli-default {
+  font-weight: bold;
+}
+
+.cli-option-syntax {
+  white-space: pre;
+}

aio/src/styles/2-modules/_code.scss

@@ -137,7 +137,6 @@ aio-code pre {
 .sidenav-content code a {
   color: inherit;
   font-size: inherit;
-  font-weight: inherit;
 }
 
 /* PRETTY PRINTING STYLES for prettify.js. */

aio/src/styles/2-modules/_modules-dir.scss

@@ -8,6 +8,7 @@
    @import 'buttons';
    @import 'callout';
    @import 'card';
+   @import 'cli-pages';
    @import 'code';
    @import 'contribute';
    @import 'contributor';

aio/src/test.ts

@@ -1,9 +1,5 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
-// Reflect.metadata polyfill is only needed in the JIT mode which we use only for unit tests
-import 'core-js/es6/reflect';
-import 'core-js/es7/reflect';
-
 import 'zone.js/dist/zone-testing';
 import { getTestBed } from '@angular/core/testing';
 import {
@@ -13,6 +9,10 @@ import {
 
 declare const require: any;
 
+// Reflect.metadata polyfill is only needed in the JIT mode which we use only for unit tests
+import 'core-js/es6/reflect';
+import 'core-js/es7/reflect';
+
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
     BrowserDynamicTestingModule,

aio/tests/e2e/api.e2e-spec.ts

@@ -8,19 +8,7 @@ describe('Api pages', function() {
 
   it('should show direct and indirect subclasses of a class', () => {
     const page = new ApiPage('api/forms/AbstractControlDirective');
-    expect(page.getDescendants('class')).toEqual([
-      'ControlContainer',
-      'AbstractFormGroupDirective',
-      'NgModelGroup',
-      'FormGroupName',
-      'NgForm',
-      'FormGroupDirective',
-      'FormArrayName',
-      'NgControl',
-      'NgModel',
-      'FormControlDirective',
-      'FormControlName'
-    ]);
+    expect(page.getDescendants('class')).toEqual(['ControlContainer', 'AbstractFormGroupDirective', 'NgControl']);
   });
 
   it('should show child interfaces that extend an interface', () => {
@@ -38,9 +26,14 @@ describe('Api pages', function() {
     expect(page.getOverview('type-alias').getText()).toContain('type HttpEvent<T>');
   });
 
+  it('should show readonly properties as getters', () => {
+    const page = new ApiPage('api/common/http/HttpRequest');
+    expect(page.getOverview('class').getText()).toContain('get body: T | null');
+  });
+
   it('should not show parenthesis for getters', () => {
     const page = new ApiPage('api/core/NgModuleRef');
-    expect(page.getOverview('class').getText()).toContain('injector: Injector');
+    expect(page.getOverview('class').getText()).toContain('get injector: Injector');
   });
 
   it('should show both type and initializer if set', () => {

aio/tools/examples/shared/package.json

@@ -53,7 +53,7 @@
     "@types/angular-route": "^1.3.5",
     "@types/express": "^4.0.35",
     "@types/jasmine": "~2.8.0",
-    "@types/jasminewd2": "^2.0.4",
+    "@types/jasminewd2": "^2.0.3",
     "@types/jquery": "^3.3.4",
     "@types/node": "^6.0.45",
     "canonical-path": "0.0.2",

aio/tools/ng-packages-installer/index.js

@@ -2,14 +2,11 @@
 
 const chalk = require('chalk');
 const fs = require('fs-extra');
-const lockfile = require('@yarnpkg/lockfile');
 const path = require('canonical-path');
-const semver = require('semver');
 const shelljs = require('shelljs');
 const yargs = require('yargs');
 
 const PACKAGE_JSON = 'package.json';
-const YARN_LOCK = 'yarn.lock';
 const LOCAL_MARKER_PATH = 'node_modules/_local_.json';
 const PACKAGE_JSON_REGEX = /^[^/]+\/package\.json$/;
 
@@ -65,10 +62,8 @@ class NgPackagesInstaller {
    * contents and acts as an indicator that dependencies have been overridden.
    */
   installLocalDependencies() {
-    if (this.force || !this._checkLocalMarker()) {
+    if (this._checkLocalMarker() !== true || this.force) {
       const pathToPackageConfig = path.resolve(this.projectDir, PACKAGE_JSON);
-      const pathToLockfile = path.resolve(this.projectDir, YARN_LOCK);
-      const parsedLockfile = this._parseLockfile(pathToLockfile);
       const packages = this._getDistPackages();
 
       try {
@@ -93,17 +88,17 @@ class NgPackagesInstaller {
             });
           });
 
-          fs.writeFileSync(pkg.packageJsonPath, JSON.stringify(tmpConfig, null, 2));
+          fs.writeFileSync(pkg.packageJsonPath, JSON.stringify(tmpConfig));
         });
 
-        const packageConfigFile = fs.readFileSync(pathToPackageConfig, 'utf8');
+        const packageConfigFile = fs.readFileSync(pathToPackageConfig);
         const packageConfig = JSON.parse(packageConfigFile);
 
         const [dependencies, peers] = this._collectDependencies(packageConfig.dependencies || {}, packages);
         const [devDependencies, devPeers] = this._collectDependencies(packageConfig.devDependencies || {}, packages);
 
-        this._assignPeerDependencies(peers, dependencies, devDependencies, parsedLockfile);
-        this._assignPeerDependencies(devPeers, dependencies, devDependencies, parsedLockfile);
+        this._assignPeerDependencies(peers, dependencies, devDependencies);
+        this._assignPeerDependencies(devPeers, dependencies, devDependencies);
 
         const localPackageConfig = Object.assign(Object.create(null), packageConfig, { dependencies, devDependencies });
         localPackageConfig.__angular = { local: true };
@@ -112,7 +107,7 @@ class NgPackagesInstaller {
         try {
           this._log(`Writing temporary local ${PACKAGE_JSON} to ${pathToPackageConfig}`);
           fs.writeFileSync(pathToPackageConfig, localPackageConfigJson);
-          this._installDeps('--pure-lockfile', '--check-files');
+          this._installDeps('--no-lockfile', '--check-files');
           this._setLocalMarker(localPackageConfigJson);
         } finally {
           this._log(`Restoring original ${PACKAGE_JSON} to ${pathToPackageConfig}`);
@@ -123,7 +118,7 @@ class NgPackagesInstaller {
         this._log(`Restoring original ${PACKAGE_JSON} for local Angular packages.`);
         Object.keys(packages).forEach(key => {
           const pkg = packages[key];
-          fs.writeFileSync(pkg.packageJsonPath, JSON.stringify(pkg.config, null, 2));
+          fs.writeFileSync(pkg.packageJsonPath, JSON.stringify(pkg.config));
         });
       }
     }
@@ -139,23 +134,15 @@ class NgPackagesInstaller {
 
   // Protected helpers
 
-  _assignPeerDependencies(peerDependencies, dependencies, devDependencies, parsedLockfile) {
+  _assignPeerDependencies(peerDependencies, dependencies, devDependencies) {
     Object.keys(peerDependencies).forEach(key => {
-      const peerDepRange = peerDependencies[key];
-
-      // Ignore peerDependencies whose range is already satisfied by current version in lockfile.
-      const originalRange = dependencies[key] || devDependencies[key];
-      const lockfileVersion = originalRange && parsedLockfile[`${key}@${originalRange}`].version;
-
-      if (lockfileVersion && semver.satisfies(lockfileVersion, peerDepRange)) return;
-
       // If there is already an equivalent dependency then override it - otherwise assign/override the devDependency
       if (dependencies[key]) {
-        this._log(`Overriding dependency with peerDependency: ${key}: ${peerDepRange}`);
-        dependencies[key] = peerDepRange;
+        this._log(`Overriding dependency with peerDependency: ${key}: ${peerDependencies[key]}`);
+        dependencies[key] = peerDependencies[key];
       } else {
-        this._log(`${devDependencies[key] ? 'Overriding' : 'Assigning'} devDependency with peerDependency: ${key}: ${peerDepRange}`);
-        devDependencies[key] = peerDepRange;
+        this._log(`${devDependencies[key] ? 'Overriding' : 'Assigning'} devDependency with peerDependency: ${key}: ${peerDependencies[key]}`);
+        devDependencies[key] = peerDependencies[key];
       }
     });
   }
@@ -179,6 +166,11 @@ class NgPackagesInstaller {
       }
     });
 
+    // FIXME: Temporarily use RxJS from root `node_modules/`.
+    if (peerDependencies.rxjs) {
+      peerDependencies.rxjs = `file:${ANGULAR_ROOT_DIR}/node_modules/rxjs`;
+    }
+
     return [mergedDependencies, peerDependencies];
   }
 
@@ -234,20 +226,6 @@ class NgPackagesInstaller {
     }
   }
 
-  /**
-   * Parse and return a `yarn.lock` file.
-   */
-  _parseLockfile(lockfilePath) {
-    const lockfileContent = fs.readFileSync(lockfilePath, 'utf8');
-    const parsed = lockfile.parse(lockfileContent);
-
-    if (parsed.type !== 'success') {
-      throw new Error(`[${NgPackagesInstaller.name}]: Error parsing lockfile '${lockfilePath}' (result type: ${parsed.type}).`);
-    }
-
-    return parsed.object;
-  }
-
   _printWarning() {
     const relativeScriptPath = path.relative('.', __filename.replace(/\.js$/, ''));
     const absoluteProjectDir = path.resolve(this.projectDir);

aio/tools/ng-packages-installer/index.spec.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const fs = require('fs-extra');
-const lockfile = require('@yarnpkg/lockfile');
 const path = require('canonical-path');
 const shelljs = require('shelljs');
 
@@ -12,7 +11,6 @@ describe('NgPackagesInstaller', () => {
   const absoluteRootDir = path.resolve(rootDir);
   const nodeModulesDir = path.resolve(absoluteRootDir, 'node_modules');
   const packageJsonPath = path.resolve(absoluteRootDir, 'package.json');
-  const yarnLockPath = path.resolve(absoluteRootDir, 'yarn.lock');
   const packagesDir = path.resolve(path.resolve(__dirname, '../../../dist/packages-dist'));
   const toolsDir = path.resolve(path.resolve(__dirname, '../../../dist/tools/@angular'));
   let installer;
@@ -54,26 +52,13 @@ describe('NgPackagesInstaller', () => {
 
     beforeEach(() => {
       spyOn(installer, '_checkLocalMarker');
-      spyOn(installer, '_installDeps');
-      spyOn(installer, '_setLocalMarker');
-
-      spyOn(installer, '_parseLockfile').and.returnValue({
-        'rxjs@^6.3.0': {version: '6.3.3'},
-        'zone.js@^0.8.26': {version: '0.8.27'}
-      });
 
       // These are the packages that are "found" in the dist directory
       dummyNgPackages = {
         '@angular/core': {
           parentDir: packagesDir,
           packageJsonPath: `${packagesDir}/core/package.json`,
-          config: {
-            peerDependencies: {
-              'rxjs': '^6.4.0',
-              'some-package': '5.0.1',
-              'zone.js': '~0.8.26'
-            }
-          }
+          config: { peerDependencies: { 'some-package': '5.0.1' } }
         },
         '@angular/common': {
           parentDir: packagesDir,
@@ -108,12 +93,10 @@ describe('NgPackagesInstaller', () => {
       dummyPackage = {
         dependencies: {
           '@angular/core': '4.4.1',
-          '@angular/common': '4.4.1',
-          rxjs: '^6.3.0'
+          '@angular/common': '4.4.1'
         },
         devDependencies: {
-          '@angular/compiler-cli': '4.4.1',
-          'zone.js': '^0.8.26'
+          '@angular/compiler-cli': '4.4.1'
         }
       };
       dummyPackageJson = JSON.stringify(dummyPackage);
@@ -121,23 +104,14 @@ describe('NgPackagesInstaller', () => {
 
       // This is the package.json that is temporarily written to the "test" folder
       // Note that the Angular (dev)dependencies have been modified to use a "file:" path
-      // And that the peerDependencies from `dummyNgPackages` have been updated or added as
-      // (dev)dependencies (unless the current version in lockfile satisfies semver).
-      //
-      // For example, `zone.js@0.8.27` (from lockfile) satisfies `zone.js@~0.8.26` (from
-      // `@angular/core`), thus `zone.js: ^0.8.26` (from original `package.json`) is retained.
-      // In contrast, `rxjs@6.3.3` (from lockfile) does not satisfy `rxjs@^6.4.0 (from
-      // `@angular/core`), thus `rxjs: ^6.3.0` (from original `package.json`) is replaced with
-      // `rxjs: ^6.4.0` (from `@angular/core`).
+      // And that the peerDependencies from `dummyNgPackages` have been added as (dev)dependencies.
       expectedModifiedPackage = {
         dependencies: {
           '@angular/core': `file:${packagesDir}/core`,
-          '@angular/common': `file:${packagesDir}/common`,
-          'rxjs': '^6.4.0'
+          '@angular/common': `file:${packagesDir}/common`
         },
         devDependencies: {
           '@angular/compiler-cli': `file:${toolsDir}/compiler-cli`,
-          'zone.js': '^0.8.26',
           'some-package': '5.0.1',
           typescript: '^2.4.2'
         },
@@ -147,20 +121,12 @@ describe('NgPackagesInstaller', () => {
     });
 
     describe('when there is a local package marker', () => {
-      beforeEach(() => installer._checkLocalMarker.and.returnValue(true));
-
       it('should not continue processing', () => {
+        installer._checkLocalMarker.and.returnValue(true);
         installer.installLocalDependencies();
         expect(installer._checkLocalMarker).toHaveBeenCalled();
         expect(installer._getDistPackages).not.toHaveBeenCalled();
       });
-
-      it('should continue processing (without checking for local marker) if `force` is true', () => {
-        installer.force = true;
-        installer.installLocalDependencies();
-        expect(installer._checkLocalMarker).not.toHaveBeenCalled();
-        expect(installer._getDistPackages).toHaveBeenCalled();
-      });
     });
 
     describe('when there is no local package marker', () => {
@@ -169,14 +135,14 @@ describe('NgPackagesInstaller', () => {
       beforeEach(() => {
         log = [];
         fs.writeFileSync.and.callFake((filePath, contents) => filePath === packageJsonPath && log.push(`writeFile: ${contents}`));
-        installer._installDeps.and.callFake((...args) => log.push(`installDeps: ${args.join(' ')}`));
+        spyOn(installer, '_installDeps').and.callFake(() => log.push('installDeps:'));
+        spyOn(installer, '_setLocalMarker');
         installer._checkLocalMarker.and.returnValue(false);
         installer.installLocalDependencies();
       });
 
-      it('should parse the lockfile and get the dist packages', () => {
+      it('should get the dist packages', () => {
         expect(installer._checkLocalMarker).toHaveBeenCalled();
-        expect(installer._parseLockfile).toHaveBeenCalledWith(yarnLockPath);
         expect(installer._getDistPackages).toHaveBeenCalled();
       });
 
@@ -184,32 +150,31 @@ describe('NgPackagesInstaller', () => {
         const pkgJsonFor = pkgName => dummyNgPackages[`@angular/${pkgName}`].packageJsonPath;
         const pkgConfigFor = pkgName => copyJsonObj(dummyNgPackages[`@angular/${pkgName}`].config);
         const overwriteConfigFor = (pkgName, newProps) => Object.assign(pkgConfigFor(pkgName), newProps);
-        const stringifyConfig = config => JSON.stringify(config, null, 2);
 
         const allArgs = fs.writeFileSync.calls.allArgs();
         const firstFiveArgs = allArgs.slice(0, 5);
         const lastFiveArgs = allArgs.slice(-5);
 
         expect(firstFiveArgs).toEqual([
-          [pkgJsonFor('core'), stringifyConfig(overwriteConfigFor('core', {private: true}))],
-          [pkgJsonFor('common'), stringifyConfig(overwriteConfigFor('common', {private: true}))],
-          [pkgJsonFor('compiler'), stringifyConfig(overwriteConfigFor('compiler', {private: true}))],
-          [pkgJsonFor('compiler-cli'), stringifyConfig(overwriteConfigFor('compiler-cli', {
+          [pkgJsonFor('core'), JSON.stringify(overwriteConfigFor('core', {private: true}))],
+          [pkgJsonFor('common'), JSON.stringify(overwriteConfigFor('common', {private: true}))],
+          [pkgJsonFor('compiler'), JSON.stringify(overwriteConfigFor('compiler', {private: true}))],
+          [pkgJsonFor('compiler-cli'), JSON.stringify(overwriteConfigFor('compiler-cli', {
             private: true,
             dependencies: { '@angular/tsc-wrapped': `file:${toolsDir}/tsc-wrapped` }
           }))],
-          [pkgJsonFor('tsc-wrapped'), stringifyConfig(overwriteConfigFor('tsc-wrapped', {
+          [pkgJsonFor('tsc-wrapped'), JSON.stringify(overwriteConfigFor('tsc-wrapped', {
             private: true,
             devDependencies: { '@angular/common': `file:${packagesDir}/common` }
           }))],
         ]);
 
         expect(lastFiveArgs).toEqual(['core', 'common', 'compiler', 'compiler-cli', 'tsc-wrapped']
-            .map(pkgName => [pkgJsonFor(pkgName), stringifyConfig(pkgConfigFor(pkgName))]));
+            .map(pkgName => [pkgJsonFor(pkgName), JSON.stringify(pkgConfigFor(pkgName))]));
       });
 
       it('should load the package.json', () => {
-        expect(fs.readFileSync).toHaveBeenCalledWith(packageJsonPath, 'utf8');
+        expect(fs.readFileSync).toHaveBeenCalledWith(packageJsonPath);
       });
 
       it('should overwrite package.json with modified config', () => {
@@ -223,7 +188,7 @@ describe('NgPackagesInstaller', () => {
       it('should overwrite package.json, then install deps, then restore original package.json', () => {
         expect(log).toEqual([
           `writeFile: ${expectedModifiedPackageJson}`,
-          `installDeps: --pure-lockfile --check-files`,
+          `installDeps:`,
           `writeFile: ${dummyPackageJson}`
         ]);
       });
@@ -299,42 +264,6 @@ describe('NgPackagesInstaller', () => {
     });
   });
 
-  describe('_parseLockfile()', () => {
-    let originalLockfileParseDescriptor;
-
-    beforeEach(() => {
-      // Workaround for `lockfile.parse()` being non-writable.
-      let parse = lockfile.parse;
-      originalLockfileParseDescriptor = Object.getOwnPropertyDescriptor(lockfile, 'parse');
-      Object.defineProperty(lockfile, 'parse', {
-        get() { return parse; },
-        set(newParse) { parse = newParse; },
-      });
-
-      fs.readFileSync.and.returnValue('mock content');
-      spyOn(lockfile, 'parse').and.returnValue({type: 'success', object: {foo: {version: 'bar'}}});
-    });
-
-    afterEach(() => Object.defineProperty(lockfile, 'parse', originalLockfileParseDescriptor));
-
-    it('should parse the specified lockfile', () => {
-      installer._parseLockfile('/foo/bar/yarn.lock');
-      expect(fs.readFileSync).toHaveBeenCalledWith('/foo/bar/yarn.lock', 'utf8');
-      expect(lockfile.parse).toHaveBeenCalledWith('mock content');
-    });
-
-    it('should throw if parsing the lockfile fails', () => {
-      lockfile.parse.and.returnValue({type: 'not success'});
-      expect(() => installer._parseLockfile('/foo/bar/yarn.lock')).toThrowError(
-          '[NgPackagesInstaller]: Error parsing lockfile \'/foo/bar/yarn.lock\' (result type: not success).');
-    });
-
-    it('should return the parsed lockfile content as an object', () => {
-      const parsed = installer._parseLockfile('/foo/bar/yarn.lock');
-      expect(parsed).toEqual({foo: {version: 'bar'}});
-    });
-  });
-
   describe('_printWarning()', () => {
     it('should mention the message passed in the warning', () => {
       installer._printWarning();

aio/tools/transforms/angular-api-package/processors/matchUpDirectiveDecorators.js

@@ -21,63 +21,64 @@ module.exports = function matchUpDirectiveDecorators() {
         if (doc.docType === 'directive') {
 
           doc.selector = stripQuotes(doc.directiveOptions.selector);
-          doc.selectorArray = doc.selector ? doc.selector.split(',') : [];
           doc.exportAs = stripQuotes(doc.directiveOptions.exportAs);
-          doc.exportAsArray = doc.exportAs ? doc.exportAs.split(',') : [];
 
-          attachBindingInfo(doc.directiveOptions.inputs, doc.members, 'Input');
-          attachBindingInfo(doc.directiveOptions.outputs, doc.members, 'Output');
+          doc.inputs = getBindingInfo(doc.directiveOptions.inputs, doc.members, 'Input');
+          doc.outputs = getBindingInfo(doc.directiveOptions.outputs, doc.members, 'Output');
         }
       });
     }
   };
 };
 
-function attachBindingInfo(directiveBindings, members, bindingType) {
+function getBindingInfo(directiveBindings, members, bindingType) {
   const bindings = {};
 
-  if (members) {
-    // Parse the bindings from the directive decorator
-    if (directiveBindings) {
-      directiveBindings.forEach(function(binding) {
-        const bindingInfo = parseBinding(bindingType, binding);
-        bindings[bindingInfo.propertyName] = bindingInfo;
-      });
-    }
+  // Parse the bindings from the directive decorator
+  if (directiveBindings) {
+    directiveBindings.forEach(function(binding) {
+      const bindingInfo = parseBinding(binding);
+      bindings[bindingInfo.propertyName] = bindingInfo;
+    });
+  }
 
+  if (members) {
     members.forEach(function(member) {
       if (member.decorators) {
         // Search for members with binding decorators
         member.decorators.forEach(function(decorator) {
           if (decorator.name === bindingType) {
-            bindings[member.name] = createBindingInfo(bindingType, member.name, decorator.arguments[0] || member.name);
+            bindings[member.name] = createBindingInfo(member.name, decorator.arguments[0] || member.name);
           }
         });
       }
-      // Attach binding info to the member
-      // Note: this may have come from the `@Directive` decorator or from a property decorator such as `@Input`.
+
+      // Now ensure that any bindings have the associated member attached
+      // Note that this binding could have come from the directive decorator
       if (bindings[member.name]) {
-        member.boundTo = bindings[member.name];
+        bindings[member.name].memberDoc = member;
       }
     });
   }
+
+  // Convert the map back to an array
+  return Object.keys(bindings).map(function(key) { return bindings[key]; });
 }
 
 function stripQuotes(value) {
   return (typeof(value) === 'string') ? value.trim().replace(/^(['"])(.*)\1$/, '$2') : value;
 }
 
-function parseBinding(bindingType, option) {
+function parseBinding(option) {
   // Directive decorator bindings are of the form: "propName : bindingName" (bindingName is optional)
   const optionPair = option.split(':');
   const propertyName = optionPair[0].trim();
   const bindingName = (optionPair[1] || '').trim() || propertyName;
-  return createBindingInfo(bindingType, propertyName, bindingName);
+  return createBindingInfo(propertyName, bindingName);
 }
 
-function createBindingInfo(bindingType, propertyName, bindingName) {
+function createBindingInfo(propertyName, bindingName) {
   return {
-    type: bindingType,
     propertyName: stripQuotes(propertyName),
     bindingName: stripQuotes(bindingName)
   };