ci: replace our pullapprove setup with GitHub CODEOWNERS

Summary of changes:
- created .github/CODEOWNERS with docs and config similar to the one in .pullapprove.yml
- updated docs
- updated .github/angular-robot.yml to not expect pullapprove status
- removed .pullapprove.yml

The primary motivations behind this change are:
- CODEOWNERS didn't exist when we introduced pullapprove
- CODEOWNERS is a functionality tightly integrated with github which results in better DX
- pullapprove v2 has been very unstable recently causing productivity loss
- pullapprove v2 has been deprecated in favor of v3, which requires and migration

.bazelrc

@@ -74,3 +74,28 @@ test --experimental_ui
 # to determine if the compiler used should be Ivy or ViewEngine one can use `--define=compile=aot` on
 # any bazel target. This is a temporary flag until codebase is permanently switched to Ivy.
 build --define=compile=legacy
+
+###############################
+# Remote Build Execution support
+# Turn on these settings with
+#  --config=remote
+###############################
+
+# Load default settings for Remote Build Execution
+import %workspace%/third_party/github.com/bazelbuild/bazel-toolchains/bazelrc/bazel-0.20.0.bazelrc
+
+# Increase the default number of jobs by 50% because our build has lots of
+# parallelism
+build:remote --jobs=150
+
+# Point to our custom execution platform; see tools/BUILD.bazel
+build:remote --extra_execution_platforms=//tools:rbe_ubuntu1604-angular
+build:remote --host_platform=//tools:rbe_ubuntu1604-angular
+build:remote --platforms=//tools:rbe_ubuntu1604-angular
+
+# Remote instance.
+build:remote --remote_instance_name=projects/internal-200822/instances/default_instance
+
+# Do not accept remote cache.
+# We need to understand the security risks of using prior build artifacts.
+build:remote --remote_accept_cached=false

.circleci/bazel.rc

@@ -1,6 +1,6 @@
 # These options are enabled when running on CI
 # We do this by copying this file to /etc/bazel.bazelrc at the start of the build.
-# See remote cache documentation in /docs/BAZEL.md
+# See documentation in /docs/BAZEL.md
 
 # Don't be spammy in the logs
 # TODO(gmagolan): Hide progress again once build performance improves
@@ -8,9 +8,6 @@
 # error: Too long with no output (exceeded 10m0s)
 # build --noshow_progress
 
-# Don't run manual tests
-test --test_tag_filters=-manual
-
 # Print all the options that apply to the build.
 # This helps us diagnose which options override others
 # (e.g. /etc/bazel.bazelrc vs. tools/bazel.rc)

.circleci/config.yml

@@ -25,7 +25,10 @@ var_4: &define_env_vars
 var_5: &setup_bazel_remote_execution
   run:
     name: "Setup bazel RBE remote execution"
-    command: openssl aes-256-cbc -d -in .circleci/gcp_token -k "$CI_REPO_NAME" -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"
+    command: |
+      openssl aes-256-cbc -d -in .circleci/gcp_token -k "$CI_REPO_NAME" -out /home/circleci/.gcp_credentials
+      echo "export GOOGLE_APPLICATION_CREDENTIALS=/home/circleci/.gcp_credentials" >> $BASH_ENV
+      sudo bash -c "echo 'build --config=remote' >> /etc/bazel.bazelrc"
 
 # Settings common to each job
 var_6: &job_defaults
@@ -53,21 +56,19 @@ version: 2
 jobs:
   lint:
     <<: *job_defaults
-    resource_class: xlarge
     steps:
       - checkout:
           <<: *post_checkout
       - restore_cache:
           key: *cache_key
       - *define_env_vars
-      - *setup_circleci_bazel_config
       - *yarn_install
 
-      - run: 'yarn buildifier -mode=check ||
-              (echo "BUILD files not formatted. Please run ''yarn buildifier''" ; exit 1)'
+      - run: 'yarn bazel:format -mode=check ||
+              (echo "BUILD files not formatted. Please run ''yarn bazel:format''" ; exit 1)'
       # Run the skylark linter to check our Bazel rules
-      - run: 'yarn skylint ||
-              (echo -e "\n.bzl files have lint errors. Please run ''yarn skylint''"; exit 1)'
+      - run: 'yarn bazel:lint ||
+              (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'
 
       - run: ./node_modules/.bin/gulp lint
 

.circleci/rbe-bazel.rc

@@ -1,77 +0,0 @@
-# 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

.editorconfig

@@ -1,4 +1,4 @@
-# http://editorconfig.org
+# https://editorconfig.org
 
 root = true
 

.github/CODEOWNERS

@@ -0,0 +1,758 @@
+# ==================================================================================
+# ==================================================================================
+#                                Angular CODEOWNERS
+# ==================================================================================
+# ==================================================================================
+#
+#  Configuration of code ownership and review approvals for the angular/angular repo.
+#
+#  More info: https://help.github.com/articles/about-codeowners/
+#
+
+
+# ================================================
+#  General rules / philosophy
+# ================================================
+#
+#  - we trust that people do the right thing and not approve changes they don't feel confident reviewing
+#  - we use github teams so that we funnel code reviews to the most appropriate reviewer, this is why the team structure is fine-grained
+#  - we enforce that only approved PRs get merged to ensure that unreviewed code doesn't get accidentaly merged
+#  - we delegate approval rights as much as possible so that we can scale better
+#  - each group must have at least one person, but several people are preferable to avoid a single point of failure issues
+#  - most file groups have one or two global approvers groups as fallbacks:
+#    - @angular/fw-global-approvers: for approving minor changes, large-scale refactorings, and emergency situations.
+#    - @angular/fw-global-approvers-for-docs-only-changes: for approving minor documentation-only changes that don't require engineering review
+#  - a small number of file groups have very limited number of reviewers because incorrect changes to the files they guard would have serious consequences (e.g. security, public api)
+#
+#  Configuration nuances:
+#
+#  - This configuration works in conjunction with the protected branch settings that require all changes to be made via pull requests with at least one approval.
+#  - This approval can come from an appropriate codeowner, or any repo collaborator (person with write access) if the PR is authored by a codeowner.
+#  - Each codeowners team must have write access to the repo, otherwise their reviewes won't count.
+#
+#  In the case of emergency, the repo administrators which include angular-caretaker can bypass this requirement.
+
+
+
+# ================================================
+#  GitHub username registry
+#  (just to make this file easier to understand)
+# ================================================
+
+#  alexeagle - Alex Eagle
+#  alxhub - Alex Rickabaugh
+#  AndrewKushnir - Andrew Kushnir
+#  andrewseguin - Andrew Seguin
+#  benlesh - Ben Lesh
+#  brandonroberts - Brandon Roberts
+#  filipesilva - Filipe Silva
+#  gkalpak - George Kalpakas
+#  hansl - Hans Larsen
+#  IgorMinar - Igor Minar
+#  jasonaden - Jason Aden
+#  jenniferfell - Jennifer Fell
+#  kara - Kara Erickson
+#  kyliau - Keen Yee Liau
+#  matsko - Matias Niemelä
+#  mhevery - Misko Hevery
+#  ocombe - Olivier Combe
+#  petebacondarwin - Pete Bacon Darwin
+#  pkozlowski-opensource - Pawel Kozlowski
+#  robwormald - Rob Wormald
+#  stephenfluin - Stephen Fluin
+#  vikerman - Vikram Subramanian
+
+
+
+######################################################################################################
+#
+#  Team structure and memberships
+#  ------------------------------
+#
+#  This section is here just because the GitHub UI is too hard to navigate and audit.
+#
+#  Any changes to team structure or memberships must first be made in this file and only then
+#  implemented in the GitHub UI.
+#######################################################################################################
+
+
+# ===========================================================
+#  @angular/framework-global-approvers
+# ===========================================================
+#  Used for approving minor changes, large-scale refactorings, and emergency situations.
+#  (secret team to avoid review requests, it also doesn't inherit from @angular/framework because nested teams can't be secret)
+#
+#   - IgorMinar
+#   - kara
+#   - mhevery
+
+
+# ===========================================================
+#  @angular/framework-global-approvers-for-docs-only-changes
+# ===========================================================
+#  Used for approving minor documentation-only changes that don't require engineering review.
+#  (secret team to avoid review requests, it also doesn't inherit from @angular/framework because nested teams can't be secret)
+#
+#   - gkalpak
+#   - jenniferfell
+#   - petebacondarwin
+
+
+# ===========================================================
+#  @angular/fw-animations
+# ===========================================================
+#
+#   - matsko
+
+
+# ===========================================================
+#  @angular/tools-bazel
+# ===========================================================
+#
+#   - alexeagle
+#   - kyliau
+#   - IgorMinar
+
+
+# ===========================================================
+#  @angular/tools-cli
+# ===========================================================
+#
+#   - alexeagle
+#   - filipesilva
+#   - hansl
+
+
+# ===========================================================
+#  @angular/fw-compiler
+# ===========================================================
+#
+#   - alxhub
+
+
+# ===========================================================
+#  @angular/fw-ngcc
+# ===========================================================
+#
+#   - alxhub
+#   - gkalpak
+#   - petebacondarwin
+
+
+# ===========================================================
+#  @angular/fw-core
+# ===========================================================
+#
+#   - alxhub
+#   - AndrewKushnir
+#   - kara
+#   - mhevery
+#   - pkozlowski-opensource
+
+
+# ===========================================================
+#  @angular/fw-http
+# ===========================================================
+#
+#   - alxhub
+#   - IgorMinar
+
+
+# ===========================================================
+#  @angular/fw-elements
+# ===========================================================
+#
+#   - andrewseguin
+#   - gkalpak
+#   - robwormald
+
+
+# ===========================================================
+#  @angular/fw-forms
+# ===========================================================
+#
+#   - kara
+
+
+# ===========================================================
+#  @angular/tools-language-service
+# ===========================================================
+#
+#   - kyliau
+
+
+# ===========================================================
+#  @angular/fw-server
+# ===========================================================
+#
+#   - alxhub
+#   - vikerman
+
+
+# ===========================================================
+#  @angular/fw-router
+# ===========================================================
+#
+#   - jasonaden
+
+
+# ===========================================================
+#  @angular/fw-service-worker
+# ===========================================================
+#
+#   - alxhub
+#   - gkalpak
+#   - IgorMinar
+
+
+# ===========================================================
+#  @angular/fw-upgrade
+# ===========================================================
+#
+#   - gkalpak
+#   - petebacondarwin
+
+
+# ===========================================================
+#  @angular/fw-testing
+# ===========================================================
+#
+#   - vikerman
+
+
+# ===========================================================
+#  @angular/fw-i18n
+# ===========================================================
+#
+#   - AndrewKushnir
+#   - mhevery
+#   - ocombe
+#   - vikerman
+
+
+# ===========================================================
+#  @angular/fw-security
+# ===========================================================
+#
+#   - IgorMinar
+#   - mhevery
+
+
+# ===========================================================
+#  @angular/tools-benchpress
+# ===========================================================
+#
+#   - alxhub
+
+
+# ===========================================================
+#  @angular/fw-integration
+# ===========================================================
+#
+#   - alexeagle
+#   - IgorMinar
+#   - mhevery
+
+
+# ===========================================================
+#  @angular/docs-infra
+# ===========================================================
+#
+#   - gkalpak
+#   - IgorMinar
+#   - petebacondarwin
+
+
+# ===========================================================
+#  @angular/fw-docs-intro
+# ===========================================================
+#
+#   - brandonroberts
+#   - IgorMinar
+#   - stephenfluin
+
+
+# ===========================================================
+#  @angular/fw-docs-observables
+# ===========================================================
+#
+#   - benlesh
+#   - jasonaden
+
+
+# ===========================================================
+#  @angular/fw-docs-packaging
+# ===========================================================
+#
+#   - alexeagle
+#   - IgorMinar
+
+
+# ===========================================================
+#  @angular/fw-docs-marketing
+# ===========================================================
+#
+#   - IgorMinar
+#   - stephenfluin
+
+
+# ===========================================================
+#  @angular/fw-public-api
+# ===========================================================
+#
+#   - IgorMinar
+
+
+# ===========================================================
+#  @angular/fw-dev-infra
+# ===========================================================
+#
+#   - alexeagle
+#   - IgorMinar
+
+
+
+
+
+######################################################################################################
+#
+# CODEOWNERS rules
+# -----------------
+#
+# All the following rules are applied in the order specified in this file.
+# The last rule that matches wins!
+#
+# See https://git-scm.com/docs/gitignore#_pattern_format for pattern syntax docs.
+#
+######################################################################################################
+
+
+# ================================================
+#  Default Owners
+# (in case no pattern matches a path in a PR - this should be treated as a bug and result in adding the path to CODEOWNERS)
+# ================================================
+
+* @IgorMinar @angular/framework-global-approvers
+
+
+
+# ================================================
+#  @angular/animations
+# ================================================
+
+/packages/animations/**                                         @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/platform-browser/animations/**                        @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/animations.md                                @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/animations/**                             @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/animations/**                         @angular/fw-animations @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular/bazel
+# ================================================
+
+/packages/bazel/**                                              @angular/tools-bazel @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular/compiler
+#  @angular/compiler-cli
+# ================================================
+
+/packages/compiler/**                                           @angular/fw-compiler @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/compiler-cli/**                                       @angular/fw-compiler @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/aot-compiler.md                              @angular/fw-compiler @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  packages/compiler-cli/src/ngcc/
+# ================================================
+
+/packages/compiler-cli/src/ngcc/**                              @angular/fw-ngcc @angular/framework-global-approvers
+
+
+
+# ================================================
+#  @angular/compiler-cli/ngtools
+#
+#  a rule to control API changes between @angular/compiler-cli and @angular/cli
+# ================================================
+
+/packages/compiler-cli/src/ngtools/**                           @angular/tools-cli @angular/framework-global-approvers
+
+
+
+# ================================================
+#  @angular/core
+#  @angular/common (except @angular/common/http)
+#  @angular/platform-browser
+#  @angular/platform-browser-dynamic
+#  @angular/platform-webworker
+# ================================================
+
+/packages/core/**                                               @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/common/**                                             @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/platform-browser/**                                   @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/platform-browser-dynamic/**                           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/platform-webworker/**                                 @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/attribute-directives.md                      @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/attribute-directives/**                   @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/attribute-directives/**               @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/bootstrapping.md                             @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/bootstrapping/**                          @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/component-interaction.md                     @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/component-interaction/**                  @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/component-interaction/**              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/component-styles.md                          @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/component-styles/**                       @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/dependency-injection.md                      @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/dependency-injection/**                   @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/dependency-injection/**               @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/dependency-injection-in-action.md            @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/dependency-injection-in-action/**         @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/dependency-injection-in-action/**     @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/dependency-injection-pattern.md              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/dynamic-component-loader.md                  @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/dynamic-component-loader/**               @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/dynamic-component-loader/**           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/entry-components.md                          @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/feature-modules.md                           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/feature-modules/**                        @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/feature-modules/**                    @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/frequent-ngmodules.md                        @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/frequent-ngmodules/**                 @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/hierarchical-dependency-injection.md         @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/hierarchical-dependency-injection/**      @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/lazy-loading-ngmodules.md                    @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/lazy-loading-ngmodules/**                 @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/lazy-loading-ngmodules/**             @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/lifecycle-hooks.md                           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/lifecycle-hooks/**                        @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/lifecycle-hooks/**                    @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/examples/ngcontainer/**                            @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/ngcontainer/**                        @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/ngmodules.md                                 @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/ngmodules/**                              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/ngmodule/**                               @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/ngmodule/**                           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/ngmodule-api.md                              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/ngmodule-faq.md                              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/ngmodule-faq/**                           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/ngmodule-vs-jsmodule.md                      @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/module-types.md                              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/template-syntax.md                           @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/template-syntax/**                        @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/template-syntax/**                    @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/pipes.md                                     @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/pipes/**                                  @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/pipes/**                              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/providers.md                                 @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/providers/**                              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/singleton-services.md                        @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/set-document-title.md                        @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/set-document-title/**                     @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/set-document-title/**                 @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/sharing-ngmodules.md                         @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+/aio/content/guide/structural-directives.md                     @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/structural-directives/**                  @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/structural-directives/**              @angular/fw-core @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular/common/http
+# ================================================
+
+/packages/common/http/**                                        @angular/fw-http @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/http/**                                               @angular/fw-http @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/http.md                                      @angular/fw-http @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/http/**                                   @angular/fw-http @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/http/**                               @angular/fw-http @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular/elements
+# ================================================
+
+/packages/elements/**                                           @angular/fw-elements @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/elements/**                               @angular/fw-elements @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/elements/**                           @angular/fw-elements @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/elements.md                                  @angular/fw-elements @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+# ================================================
+#  @angular/forms
+# ================================================
+
+/packages/forms/**                                              @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/forms.md                                     @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/forms/**                                  @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/forms/**                              @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/forms-overview.md                            @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/forms-overview/**                         @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/forms-overview/**                     @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/form-validation.md                           @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/form-validation/**                        @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/form-validation/**                    @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/dynamic-form.md                              @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/dynamic-form/**                           @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/dynamic-form/**                       @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/reactive-forms.md                            @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/reactive-forms/**                         @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/reactive-forms/**                     @angular/fw-forms @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular/language-service
+# ================================================
+
+/packages/language-service/**                                   @angular/tools-language-service @angular/framework-global-approvers
+/aio/content/guide/language-service.md                          @angular/tools-language-service @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/language-service/**                   @angular/tools-language-service @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular/platform-server
+# ================================================
+
+/packages/platform-server/**                                    @angular/fw-server @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/universal.md                                 @angular/fw-server @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/universal/**                              @angular/fw-server @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular/router
+# ================================================
+
+/packages/router/**                                             @angular/fw-router @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/router.md                                    @angular/fw-router @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/router/**                                 @angular/fw-router @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/router/**                             @angular/fw-router @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular/service-worker
+# ================================================
+
+/packages/service-worker/**                                     @angular/fw-service-worker @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/service-worker-getting-started.md            @angular/fw-service-worker @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/service-worker-getting-started/**         @angular/fw-service-worker @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/service-worker-communications.md             @angular/fw-service-worker @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/service-worker-config.md                     @angular/fw-service-worker @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/service-worker-devops.md                     @angular/fw-service-worker @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/service-worker-intro.md                      @angular/fw-service-worker @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/service-worker/**                     @angular/fw-service-worker @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular/upgrade
+# ================================================
+
+/packages/upgrade/**                                            @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/examples/upgrade/**                                   @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/upgrade.md                                   @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/upgrade-module/**                         @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/upgrade/**                            @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/upgrade-phonecat-1-typescript/**          @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/upgrade-phonecat-2-hybrid/**              @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/upgrade-phonecat-3-final/**               @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/upgrade-performance.md                       @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/ajs-quick-reference.md                       @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/ajs-quick-reference/**                    @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular/**/testing
+# ================================================
+
+testing/**                                                      @angular/fw-testing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/testing.md                                   @angular/fw-testing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/testing/**                                @angular/fw-testing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/testing/**                            @angular/fw-testing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular i18n
+# ================================================
+
+/packages/core/src/i18n/**                                      @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/core/src/render3/i18n.ts                              @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/core/src/render3/i18n.md                              @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/core/src/render3/interfaces/i18n.ts                   @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/common/locales/**                                     @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/common/src/i18n/**                                    @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/common/src/pipes/date_pipe.ts                         @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/common/src/pipes/i18n_plural_pipe.ts                  @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/common/src/pipes/i18n_select_pipe.ts                  @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/common/src/pipes/number_pipe.ts                       @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/compiler/src/i18n/**                                  @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/compiler/src/render3/view/i18n/**                     @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/compiler-cli/src/extract_i18n.ts                      @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/i18n.md                                      @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/i18n/**                                   @angular/fw-i18n @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  @angular security
+# ================================================
+
+/packages/core/src/sanitization/**                              @angular/fw-security
+/packages/core/test/linker/security_integration_spec.ts         @angular/fw-security
+/packages/compiler/src/schema/**                                @angular/fw-security
+/packages/platform-browser/src/security/**                      @angular/fw-security
+/aio/content/guide/security.md                                  @angular/fw-security @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/security/**                               @angular/fw-security @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  benchpress
+# ================================================
+
+/packages/benchpress/**                                         @angular/tools-benchpress @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  /integration/*
+# ================================================
+
+/integration/**                                                 @angular/fw-integration @angular/framework-global-approvers
+
+
+
+# ================================================
+#  docs-infra
+# ================================================
+
+/aio/*                                                          @angular/docs-infra @angular/framework-global-approvers
+/aio/aio-builds-setup/**                                        @angular/docs-infra @angular/framework-global-approvers
+/aio/scripts/**                                                 @angular/docs-infra @angular/framework-global-approvers
+/aio/src/**                                                     @angular/docs-infra @angular/framework-global-approvers
+/aio/tests/**                                                   @angular/docs-infra @angular/framework-global-approvers
+/aio/tools/**                                                   @angular/docs-infra @angular/framework-global-approvers
+
+
+
+# ================================================
+#  Docs: getting started & tutorial
+# ================================================
+
+/aio/content/guide/quickstart.md                                @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/tutorial/**                                        @angular/fw-docs-intro @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  Docs: observables
+# ================================================
+
+/aio/content/examples/observables/**                            @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/observables/**                        @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/observables.md                               @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/comparing-observables.md                     @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/observables-in-angular/**                 @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/guide/observables-in-angular/**             @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/observables-in-angular.md                    @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/practical-observable-usage/**             @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/practical-observable-usage.md                @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/rx-library/**                             @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/rx-library.md                                @angular/fw-docs-observables @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  Docs: packaging, tooling, releasing
+# ================================================
+
+/aio/content/guide/npm-packages.md                              @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/browser-support.md                           @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/typescript-configuration.md                  @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/setup-systemjs-anatomy.md                    @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/setup.md                                     @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/examples/setup/**                                  @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/deployment.md                                @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/releases.md                                  @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/guide/updating.md                                  @angular/fw-docs-packaging @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  Docs: marketing
+# ================================================
+
+/aio/content/marketing/**                                       @angular/fw-docs-marketing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/images/marketing/**                                @angular/fw-docs-marketing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/navigation.json                                    @angular/fw-docs-marketing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/aio/content/license.md                                         @angular/fw-docs-marketing @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+
+
+
+# ================================================
+#  Public API
+# ================================================
+
+/tools/public_api_guard/**                                      @angular/fw-public-api
+
+
+
+# ================================================
+#  Build & CI Owners
+# ================================================
+
+/*                                                              @angular/fw-dev-infra
+/.buildkite/**                                                  @angular/fw-dev-infra
+/.circleci/**                                                   @angular/fw-dev-infra
+/.github/**                                                     @angular/fw-dev-infra
+/docs/BAZEL.md                                                  @angular/fw-dev-infra
+/scripts/**                                                     @angular/fw-dev-infra
+/third_party/**                                                 @angular/fw-dev-infra
+/tools/**                                                       @angular/fw-dev-infra
+*.bzl                                                           @angular/fw-dev-infra
+
+
+
+# ================================================
+#  CODEOWNERS Owners owners ...
+# ================================================
+
+/.github/CODEOWNERS                                             @IgorMinar @angular/framework-global-approvers

.github/ISSUE_TEMPLATE/1-bug-report.md

@@ -4,7 +4,7 @@ about: Report a bug in the Angular Framework
 ---
 <!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
 
-Oh hi there! 😄 
+Oh hi there! 😄
 
 To expedite issue processing please search open and closed issues before submitting a new one.
 Existing issues often contain information about workarounds, resolution, or progress updates.
@@ -38,6 +38,10 @@ Please create and share minimal reproduction of the issue starting with this tem
 
 <!--
 If StackBlitz is not suitable for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue. Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.
+
+Issues that don't have enough info and can't be reproduced will be closed.
+
+You can read more about issue submission guidelines here: https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-submitting-an-issue
 -->
 
 ## 🔥 Exception or Error

.github/angular-robot.yml

@@ -39,18 +39,30 @@ merge:
       - "packages/**"
     # list of patterns to ignore for the files changed by the PR
     exclude:
-      - "packages/bazel/*.bzl"
+      - "packages/*"
+      - "packages/bazel/*"
+      - "packages/bazel/src/builders/**"
+      - "packages/bazel/src/ng_package/**"
+      - "packages/bazel/src/protractor/**"
+      - "packages/bazel/src/schematics/**"
+      - "packages/compiler-cli/src/ngcc/**"
+      - "packages/docs/**"
+      - "packages/elements/schematics/**"
+      - "packages/examples/**"
       - "packages/language-service/**"
+      - "packages/private/**"
+      - "packages/service-worker/**"
       - "**/.gitignore"
       - "**/.gitkeep"
+      - "**/yarn.lock"
       - "**/package.json"
       - "**/tsconfig-build.json"
       - "**/tsconfig.json"
       - "**/rollup.config.js"
       - "**/BUILD.bazel"
+      - "**/*.md"
       - "packages/**/integrationtest/**"
       - "packages/**/test/**"
-      - "packages/compiler-cli/src/ngcc/**"
 
   # comment that will be added to a PR when there is a conflict, leave empty or set to false to disable
   mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
@@ -59,13 +71,17 @@ merge:
   # label to monitor
   mergeLabel: "PR action: merge"
 
+  # adding any of these labels will also add the merge label
+  mergeLinkedLabels:
+    - "PR action: merge-assistance"
+
   # list of checks that will determine if the merge label can be added
   checks:
 
     # require that the PR has reviews from all requested reviewers
     #
     # This enables us to request reviews from both eng and tech writers, or multiple eng folks, and prevents accidental merges.
-    # Rather than merging PRs with pending reviews, if all PullApprove requirements are satisfied and additional reviews are not needed pending reviewers should be removed via GitHub UI (this also leaves an audit trail behind these decisions).
+    # Rather than merging PRs with pending reviews, if all approvals are obtained and additional reviews are not needed, any pending reviewers should be removed via GitHub UI (this also leaves an audit trail behind these decisions).
     requireReviews: true,
 
     # whether the PR shouldn't have a conflict with the base branch
@@ -86,7 +102,6 @@ merge:
     # list of PR statuses that need to be successful
     requiredStatuses:
       - "continuous-integration/travis-ci/pr"
-      - "code-review/pullapprove"
       - "ci/circleci: build"
       - "ci/circleci: lint"
 

.pullapprove.yml

@@ -1,542 +0,0 @@
-# Configuration for pullapprove.com
-#
-# Approval access and primary role is determined by info in the project ownership spreadsheet:
-# https://docs.google.com/spreadsheets/d/1-HIlzfbPYGsPr9KuYMe6bLfc4LXzPjpoALqtYRYTZB0/edit?pli=1#gid=0&vpid=A5
-#
-# === GitHub username to Full name map ===
-#
-# alexeagle - Alex Eagle
-# alxhub - Alex Rickabaugh
-# andrewseguin - Andrew Seguin
-# benlesh - Ben Lesh
-# brandonroberts - Brandon Roberts
-# brocco - Mike Brocchi
-# filipesilva - Filipe Silva
-# gkalpak - George Kalpakas
-# hansl - Hans Larsen
-# IgorMinar - Igor Minar
-# jasonaden - Jason Aden
-# jenniferfell - Jennifer Fell
-# kara - Kara Erickson
-# kyliau - Keen Yee Liau
-# matsko - Matias Niemelä
-# mhevery - Misko Hevery
-# petebacondarwin - Pete Bacon Darwin
-# pkozlowski-opensource - Pawel Kozlowski
-# robwormald - Rob Wormald
-# vikerman - Vikram Subramanian
-
-
-version: 2
-
-group_defaults:
-  required: 1
-  reset_on_reopened:
-    enabled: true
-  approve_by_comment:
-    enabled: false
-  # see http://docs.pullapprove.com/groups/author_approval/
-  author_approval:
-    # If the author is a reviewer on the PR, they will automatically have an "approved" status.
-    auto: true
-
-groups:
-  # Require all PRs to have at least one approval from *someone*
-  all:
-    users: all
-    required: 1
-    rejection_value: -999
-    # In this group, your self-approval does not count
-    author_approval:
-      auto: false
-      ignored: true
-    files:
-      include:
-        - "*"
-
-  root:
-    conditions:
-      files:
-        include:
-          - "*"
-        exclude:
-          - "WORKSPACE"
-          - "BUILD.bazel"
-          - ".circleci/*"
-          - "aio/*"
-          - "integration/*"
-          - "modules/*"
-          - "packages/*"
-          - "tools/*"
-    users:
-      - alexeagle
-      - IgorMinar
-      - mhevery
-
-  public-api:
-    conditions:
-      files:
-        include:
-          - "tools/public_api_guard/*"
-    users:
-      - IgorMinar
-      - mhevery
-
-  bazel:
-    conditions:
-      files:
-        include:
-          - "WORKSPACE"
-          - ".bazel*"
-          - "*.bazel"
-          - "*.bzl"
-          - "packages/bazel/*"
-          - "/docs/BAZEL.md"
-    users:
-      - alexeagle #primary
-      - kyliau
-      - IgorMinar #fallback
-      - mhevery
-      - vikerman #fallback
-      - kara
-
-  build-and-ci:
-    conditions:
-      files:
-        include:
-          - "*.yml"
-          - "*.json"
-          - "*.lock"
-          - "tools/*"
-        exclude:
-          - "aio/*"
-          - "packages/core/test/bundling/*"
-          - "tools/public_api_guard/*"
-    users:
-      - IgorMinar #primary
-      - alexeagle
-      - jasonaden
-      - mhevery #fallback
-
-  integration:
-    conditions:
-      files:
-        - "integration/*"
-    users:
-      - alexeagle
-      - mhevery
-      - IgorMinar #fallback
-
-  core:
-    conditions:
-      files:
-        - "packages/core/*"
-        - "aio/content/guide/bootstrapping.md"
-        - "aio/content/examples/bootstrapping/*"
-        - "aio/content/guide/attribute-directives.md"
-        - "aio/content/examples/attribute-directives/*"
-        - "aio/content/images/guide/attribute-directives/*"
-        - "aio/content/guide/structural-directives.md"
-        - "aio/content/examples/structural-directives/*"
-        - "aio/content/images/guide/structural-directives/*"
-        - "aio/content/guide/dynamic-component-loader.md"
-        - "aio/content/examples/dynamic-component-loader/*"
-        - "aio/content/images/guide/dynamic-component-loader/*"
-        - "aio/content/guide/template-syntax.md"
-        - "aio/content/examples/template-syntax/*"
-        - "aio/content/images/guide/template-syntax/*"
-        - "aio/content/guide/dependency-injection.md"
-        - "aio/content/examples/dependency-injection/*"
-        - "aio/content/images/guide/dependency-injection/*"
-        - "aio/content/guide/dependency-injection-in-action.md"
-        - "aio/content/examples/dependency-injection-in-action/*"
-        - "aio/content/images/guide/dependency-injection-in-action/*"
-        - "aio/content/guide/hierarchical-dependency-injection.md"
-        - "aio/content/examples/hierarchical-dependency-injection/*"
-        - "aio/content/guide/singleton-services.md"
-        - "aio/content/guide/dependency-injection-pattern.md"
-        - "aio/content/guide/providers.md"
-        - "aio/content/examples/providers/*"
-        - "aio/content/guide/component-interaction.md"
-        - "aio/content/examples/component-interaction/*"
-        - "aio/content/images/guide/component-interaction/*"
-        - "aio/content/guide/component-styles.md"
-        - "aio/content/examples/component-styles/*"
-        - "aio/content/guide/lifecycle-hooks.md"
-        - "aio/content/examples/lifecycle-hooks/*"
-        - "aio/content/images/guide/lifecycle-hooks/*"
-        - "aio/content/examples/ngcontainer/*"
-        - "aio/content/images/guide/ngcontainer/*"
-        - "aio/content/guide/pipes.md"
-        - "aio/content/examples/pipes/*"
-        - "aio/content/images/guide/pipes/*"
-        - "aio/content/guide/entry-components.md"
-        - "aio/content/guide/set-document-title.md"
-        - "aio/content/examples/set-document-title/*"
-        - "aio/content/images/guide/set-document-title/*"
-        - "aio/content/guide/ngmodules.md"
-        - "aio/content/examples/ngmodules/*"
-        - "aio/content/examples/ngmodule/*"
-        - "aio/content/images/guide/ngmodule/*"
-        - "aio/content/guide/ngmodule-faq.md"
-        - "aio/content/examples/ngmodule-faq/*"
-        - "aio/content/guide/module-types.md"
-        - "aio/content/guide/sharing-ngmodules.md"
-        - "aio/content/guide/frequent-ngmodules.md"
-        - "aio/content/images/guide/frequent-ngmodules/*"
-        - "aio/content/guide/ngmodule-api.md"
-        - "aio/content/guide/ngmodule-vs-jsmodule.md"
-        - "aio/content/guide/feature-modules.md"
-        - "aio/content/examples/feature-modules/*"
-        - "aio/content/images/guide/feature-modules/*"
-        - "aio/content/guide/lazy-loading-ngmodules.md"
-        - "aio/content/examples/lazy-loading-ngmodules/*"
-        - "aio/content/images/guide/lazy-loading-ngmodules"
-    users:
-      - mhevery #primary
-      - jasonaden
-      - kara
-      - IgorMinar
-      - jenniferfell #docs only
-
-  animations:
-    conditions:
-      files:
-        - "packages/animations/*"
-        - "packages/platform-browser/animations/*"
-        - "aio/content/guide/animations.md"
-        - "aio/content/examples/animations/*"
-        - "aio/content/images/guide/animations/*"
-    users:
-      - matsko #primary
-      - mhevery #fallback
-      - IgorMinar #fallback
-      - jenniferfell #docs only
-      - kara
-
-  compiler/i18n:
-    conditions:
-      files:
-        - "packages/compiler/src/i18n/*"
-        - "aio/content/guide/i18n.md"
-        - "aio/content/examples/i18n/*"
-    users:
-      - alxhub #primary
-      - IgorMinar #fallback
-      - mhevery #fallback
-      - jenniferfell #docs only
-      - kara
-
-  compiler:
-    conditions:
-      files:
-        - "packages/compiler/*"
-        - "aio/content/guide/aot-compiler.md"
-    users:
-      - alxhub #primary
-      - mhevery
-      - IgorMinar #fallback
-      - jenniferfell #docs only
-      - kara
-
-  compiler-cli/ngtools:
-    conditions:
-      files:
-        - "packages/compiler-cli/src/ngtools*"
-    users:
-      - hansl
-      - filipesilva #fallback
-      - IgorMinar #fallback
-      - kara
-
-  compiler-cli:
-    conditions:
-      files:
-        include:
-          - "packages/compiler-cli/*"
-          - "packages/bazel/*"
-        exclude:
-          - "packages/compiler-cli/src/ngtools*"
-    users:
-      - alexeagle
-      - alxhub
-      - IgorMinar #fallback
-      - mhevery #fallback
-      - kara
-
-  common:
-    conditions:
-      files:
-        include:
-          - "packages/common/*"
-        exclude:
-          - "packages/common/http/*"
-    users:
-      - pkozlowski-opensource #primary
-      - IgorMinar #fallback
-      - mhevery #fallback
-      - kara
-
-  forms:
-    conditions:
-      files:
-        - "packages/forms/*"
-        - "aio/content/guide/forms.md"
-        - "aio/content/examples/forms/*"
-        - "aio/content/images/guide/forms/*"
-        - "aio/content/guide/forms-overview.md"
-        - "aio/content/examples/forms-overview/*"
-        - "aio/content/images/guide/forms-overview/*"
-        - "aio/content/guide/form-validation.md"
-        - "aio/content/examples/form-validation/*"
-        - "aio/content/images/guide/form-validation/*"
-        - "aio/content/guide/dynamic-form.md"
-        - "aio/content/examples/dynamic-form/*"
-        - "aio/content/images/guide/dynamic-form/*"
-        - "aio/content/guide/reactive-forms.md"
-        - "aio/content/examples/reactive-forms/*"
-        - "aio/content/images/guide/reactive-forms/*"
-    users:
-      - kara #primary
-      - IgorMinar #fallback
-      - mhevery #fallback
-      - jenniferfell #docs only
-
-  http:
-    conditions:
-      files:
-        - "packages/common/http/*"
-        - "packages/http/*"
-        - "aio/content/guide/http.md"
-        - "aio/content/examples/http/*"
-        - "aio/content/images/guide/http/*"
-    users:
-      - alxhub #primary
-      - IgorMinar
-      - mhevery #fallback
-      - jenniferfell #docs only
-
-  language-service:
-    conditions:
-      files:
-        - "packages/language-service/*"
-        - "aio/content/guide/language-service.md"
-        - "aio/content/images/guide/language-service/*"
-    users:
-      - kyliau #primary
-      # needs secondary
-      - IgorMinar #fallback
-      - mhevery #fallback
-      - jenniferfell #docs only
-
-  router:
-    conditions:
-      files:
-        - "packages/router/*"
-        - "aio/content/guide/router.md"
-        - "aio/content/examples/router/*"
-        - "aio/content/images/guide/router/*"
-    users:
-      - jasonaden #primary
-      - IgorMinar #fallback
-      - mhevery #fallback
-      - jenniferfell #docs only
-      - kara
-
-  testing:
-    conditions:
-      files:
-        - "*/testing/*"
-        - "aio/content/guide/testing.md"
-        - "aio/content/examples/testing/*"
-        - "aio/content/images/guide/testing/*"
-    users:
-      - vikerman
-      - IgorMinar #fallback
-      - mhevery #fallback
-      - jenniferfell #docs only
-
-  upgrade:
-    conditions:
-      files:
-        - "packages/upgrade/*"
-        - "aio/content/guide/upgrade.md"
-        - "aio/content/examples/upgrade-module/*"
-        - "aio/content/images/guide/upgrade/*"
-        - "aio/content/examples/upgrade-phonecat-1-typescript/*"
-        - "aio/content/examples/upgrade-phonecat-2-hybrid/*"
-        - "aio/content/examples/upgrade-phonecat-3-final/*"
-        - "aio/content/guide/upgrade-performance.md"
-        - "aio/content/guide/ajs-quick-reference.md"
-        - "aio/content/examples/ajs-quick-reference/*"
-    users:
-      - petebacondarwin #primary
-      - gkalpak
-      - IgorMinar #fallback
-      - mhevery #fallback
-      - jenniferfell #docs only
-      - kara
-
-  platform-browser:
-    conditions:
-      files:
-        - "packages/platform-browser/*"
-    users:
-      - mhevery #primary
-      # needs secondary
-      - IgorMinar #fallback
-      - kara
-
-  platform-server:
-    conditions:
-      files:
-        - "packages/platform-server/*"
-        - "aio/content/guide/universal.md"
-        - "aio/content/examples/universal/*"
-    users:
-      - vikerman #primary
-      - alxhub #secondary
-      - IgorMinar #fallback
-      - mhevery #fallback
-      - jenniferfell #docs only
-
-  platform-webworker:
-    conditions:
-      files:
-        - "packages/platform-webworker/*"
-    users:
-      - mhevery #primary
-      # needs secondary
-      - IgorMinar #fallback
-      - kara
-
-  service-worker:
-    conditions:
-      files:
-        - "packages/service-worker/*"
-        - "aio/content/guide/service-worker-getting-started.md"
-        - "aio/content/examples/service-worker-getting-started/*"
-        - "aio/content/guide/service-worker-communications.md"
-        - "aio/content/guide/service-worker-config.md"
-        - "aio/content/guide/service-worker-devops.md"
-        - "aio/content/guide/service-worker-intro.md"
-        - "aio/content/images/guide/service-worker/*"
-    users:
-      - gkalpak #primary
-      - alxhub
-      - IgorMinar
-      - mhevery #fallback
-      - jenniferfell #docs only
-
-  elements:
-    conditions:
-      files:
-        - "packages/elements/*"
-        - "aio/content/examples/elements/*"
-        - "aio/content/images/guide/elements/*"
-        - "aio/content/guide/elements.md"
-    users:
-      - andrewseguin #primary
-      - gkalpak
-      - robwormald
-      - IgorMinar #fallback
-      - mhevery #fallback
-      - jenniferfell #docs only
-      - kara
-
-  benchpress:
-    conditions:
-      files:
-        - "packages/benchpress/*"
-    users:
-      - alxhub # primary
-      # needs secondary
-      - IgorMinar #fallback
-      - mhevery #fallback
-
-  docs-infra:
-    conditions:
-      files:
-        include:
-          - "aio/*"
-        exclude:
-          - "aio/content/*"
-    users:
-      - petebacondarwin #primary
-      - IgorMinar
-      - gkalpak
-      - mhevery #fallback
-
-  docs/guide-and-tutorial:
-    conditions:
-      files:
-        include:
-          - "aio/content/*"
-        exclude:
-          - "aio/content/marketing/*"
-          - "aio/content/navigation.json"
-          - "aio/content/license.md"
-    users:
-      - stephenfluin
-      - jenniferfell
-      - brandonroberts
-      - petebacondarwin
-      - gkalpak
-      - IgorMinar
-      - mhevery #fallback
-
-  docs/marketing:
-    conditions:
-      files:
-        include:
-          - "aio/content/marketing/*"
-          - "aio/content/images/marketing/*"
-          - "aio/content/navigation.json"
-          - "aio/content/license.md"
-    users:
-      - stephenfluin
-      - petebacondarwin
-      - gkalpak
-      - IgorMinar
-      - robwormald
-      - mhevery #fallback
-
-  docs/observables:
-    conditions:
-      files:
-        - "aio/content/examples/observables/*"
-        - "aio/content/images/guide/observables/*"
-        - "aio/content/guide/observables.md"
-        - "aio/content/guide/comparing-observables.md"
-        - "aio/content/examples/observables-in-angular/*"
-        - "aio/content/images/guide/observables-in-angular/*"
-        - "aio/content/guide/observables-in-angular.md"
-        - "aio/content/examples/practical-observable-usage/*"
-        - "aio/content/guide/practical-observable-usage.md"
-        - "aio/content/examples/rx-library/*"
-        - "aio/content/guide/rx-library.md"
-    users:
-      - jasonaden
-      - benlesh
-      - IgorMinar
-      - mhevery
-      - jenniferfell #docs only
-
-  docs/packaging:
-    conditions:
-      files:
-        - "aio/content/guide/npm-packages.md"
-        - "aio/content/guide/browser-support.md"
-        - "aio/content/guide/typescript-configuration.md"
-        - "aio/content/guide/setup-systemjs-anatomy.md"
-        - "aio/content/examples/setup/*"
-        - "aio/content/guide/setup.md"
-        - "aio/content/guide/deployment.md"
-        - "aio/content/guide/releases.md"
-        - "aio/content/guide/updating.md"
-    users:
-      - IgorMinar #primary
-      - alexeagle
-      - hansl
-      - mhevery #fallback
-      - jenniferfell #docs only

.travis.yml

@@ -37,8 +37,12 @@ env:
     - CI_MODE=saucelabs_required
     # deactivated, see #19768
     # - CI_MODE=browserstack_required
-    - CI_MODE=saucelabs_optional
-    - CI_MODE=browserstack_optional
+
+    # We disable these optional jobs because those acquire tunnel and browser instances which
+    # could lead to rate limit excess while those are failing most of the time and nobody pays
+    # attention anyway.
+    # - CI_MODE=saucelabs_optional
+    # - CI_MODE=browserstack_optional
 
 matrix:
   fast_finish: true

BUILD.bazel

@@ -23,9 +23,14 @@ filegroup(
 filegroup(
     name = "angularjs_scripts",
     srcs = [
+        # We also declare the unminfied AngularJS files since these can be used for
+        # local debugging (e.g. see: packages/upgrade/test/common/test_helpers.ts)
         "@ngdeps//node_modules/angular:angular.js",
+        "@ngdeps//node_modules/angular:angular.min.js",
         "@ngdeps//node_modules/angular-1.5:angular.js",
+        "@ngdeps//node_modules/angular-1.5:angular.min.js",
         "@ngdeps//node_modules/angular-1.6:angular.js",
+        "@ngdeps//node_modules/angular-1.6:angular.min.js",
         "@ngdeps//node_modules/angular-mocks:angular-mocks.js",
         "@ngdeps//node_modules/angular-mocks-1.5:angular-mocks.js",
         "@ngdeps//node_modules/angular-mocks-1.6:angular-mocks.js",

CHANGELOG.md

@@ -1,3 +1,88 @@
+<a name="7.2.0-rc.0"></a>
+# [7.2.0-rc.0](https://github.com/angular/angular/compare/7.2.0-beta.2...7.2.0-rc.0) (2018-12-18)
+
+
+### Bug Fixes
+
+* **animations:** do not truncate decimals for delay ([#24455](https://github.com/angular/angular/issues/24455)) ([f1c9d6a](https://github.com/angular/angular/commit/f1c9d6a))
+* **animations:** mark actual descendant node as disabled ([#26180](https://github.com/angular/angular/issues/26180)) ([df123e0](https://github.com/angular/angular/commit/df123e0))
+* **bazel:** devserver entry_module should have underscore name ([#27719](https://github.com/angular/angular/issues/27719)) ([f57916c](https://github.com/angular/angular/commit/f57916c))
+* **bazel:** emit full node stack traces when Angular compilation crashes ([#27678](https://github.com/angular/angular/issues/27678)) ([522919a](https://github.com/angular/angular/commit/522919a))
+* **bazel:** fix major/minor semver check between [@angular](https://github.com/angular)/bazel npm packager version and angular bazel repo version ([#27635](https://github.com/angular/angular/issues/27635)) ([1cc08b4](https://github.com/angular/angular/commit/1cc08b4))
+* **bazel:** Load http_archive and rules_nodejs dependencies ([#27609](https://github.com/angular/angular/issues/27609)) ([8313ffc](https://github.com/angular/angular/commit/8313ffc))
+* **bazel:** ng_package writes unrelevant definitions to bazel out ([#27519](https://github.com/angular/angular/issues/27519)) ([44dfa60](https://github.com/angular/angular/commit/44dfa60)), closes [/github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts#L105-L124](https://github.com//github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts/issues/L105-L124)
+* **bazel:** Set module_name and enable ng test ([#27715](https://github.com/angular/angular/issues/27715)) ([85866de](https://github.com/angular/angular/commit/85866de))
+* **common:** KeyValuePipe should return empty array for empty objects ([#27258](https://github.com/angular/angular/issues/27258)) ([b39efdd](https://github.com/angular/angular/commit/b39efdd))
+* **compiler-cli:** create LiteralLikeNode for String and Number literal ([#27536](https://github.com/angular/angular/issues/27536)) ([2c9b6c0](https://github.com/angular/angular/commit/2c9b6c0))
+* **router:** ensure URL is updated after second redirect with UrlUpdateStrategy="eager" ([#27523](https://github.com/angular/angular/issues/27523)) ([ad26cd6](https://github.com/angular/angular/commit/ad26cd6)), closes [#27116](https://github.com/angular/angular/issues/27116)
+* **upgrade:** upgrade Directive facade should not return different instance from constructor ([#27660](https://github.com/angular/angular/issues/27660)) ([c986d3d](https://github.com/angular/angular/commit/c986d3d))
+
+
+### Features
+
+* add support for typescript 3.2 ([#27536](https://github.com/angular/angular/issues/27536)) ([17e702b](https://github.com/angular/angular/commit/17e702b))
+* **router:** add predicate function  mode for runGuardsAndResolvers ([#27682](https://github.com/angular/angular/issues/27682)) ([12c3176](https://github.com/angular/angular/commit/12c3176)), closes [#26861](https://github.com/angular/angular/issues/26861) [#18253](https://github.com/angular/angular/issues/18253) [#27464](https://github.com/angular/angular/issues/27464)
+
+
+
+<a name="7.1.4"></a>
+## [7.1.4](https://github.com/angular/angular/compare/7.1.3...7.1.4) (2018-12-18)
+
+
+### Bug Fixes
+
+* **animations:** do not truncate decimals for delay ([#24455](https://github.com/angular/angular/issues/24455)) ([cd1e206](https://github.com/angular/angular/commit/cd1e206))
+* **animations:** mark actual descendant node as disabled ([#26180](https://github.com/angular/angular/issues/26180)) ([453589f](https://github.com/angular/angular/commit/453589f))
+* **bazel:** devserver entry_module should have underscore name ([#27719](https://github.com/angular/angular/issues/27719)) ([b108e9a](https://github.com/angular/angular/commit/b108e9a))
+* **bazel:** emit full node stack traces when Angular compilation crashes ([#27678](https://github.com/angular/angular/issues/27678)) ([0d8528b](https://github.com/angular/angular/commit/0d8528b))
+* **bazel:** fix major/minor semver check between [@angular](https://github.com/angular)/bazel npm packager version and angular bazel repo version ([#27635](https://github.com/angular/angular/issues/27635)) ([3ed1e84](https://github.com/angular/angular/commit/3ed1e84))
+* **bazel:** Load http_archive and rules_nodejs dependencies ([#27609](https://github.com/angular/angular/issues/27609)) ([89ace1a](https://github.com/angular/angular/commit/89ace1a))
+* **bazel:** ng_package writes unrelevant definitions to bazel out ([#27519](https://github.com/angular/angular/issues/27519)) ([ef056c5](https://github.com/angular/angular/commit/ef056c5)), closes [/github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts#L105-L124](https://github.com//github.com/angular/angular/blob/4f9374951d67c75f67a31c110bd61ab72563db7d/packages/bazel/src/ng_package/packager.ts/issues/L105-L124)
+* **bazel:** Read latest versions from latest-versions.ts & use semver check ([#27591](https://github.com/angular/angular/issues/27591)) ([93078e3](https://github.com/angular/angular/commit/93078e3))
+* **bazel:** Set module_name and enable ng test ([#27715](https://github.com/angular/angular/issues/27715)) ([183f278](https://github.com/angular/angular/commit/183f278))
+* **common:** KeyValuePipe should return empty array for empty objects ([#27258](https://github.com/angular/angular/issues/27258)) ([fa3af8b](https://github.com/angular/angular/commit/fa3af8b))
+
+
+
+<a name="7.2.0-beta.2"></a>
+# [7.2.0-beta.2](https://github.com/angular/angular/compare/7.2.0-beta.1...7.2.0-beta.2) (2018-12-11)
+
+
+### Bug Fixes
+
+* **bazel:** fix TS errors in the `schematics/bazel-workspace` files ([#27600](https://github.com/angular/angular/issues/27600)) ([3290fc3](https://github.com/angular/angular/commit/3290fc3))
+* **bazel:** Read latest versions from latest-versions.ts & use semver check ([#27526](https://github.com/angular/angular/issues/27526)) ([30a3b49](https://github.com/angular/angular/commit/30a3b49))
+* **bazel:** tsickle dependency not working with typescript 3.1.x ([#27402](https://github.com/angular/angular/issues/27402)) ([f034114](https://github.com/angular/angular/commit/f034114))
+* **forms:** typed argument for FormBuilder group ([#26985](https://github.com/angular/angular/issues/26985)) ([b0c7561](https://github.com/angular/angular/commit/b0c7561))
+
+
+
+<a name="7.1.3"></a>
+## [7.1.3](https://github.com/angular/angular/compare/7.1.2...7.1.3) (2018-12-11)
+
+
+### Bug Fixes
+
+* **bazel:** tsickle dependency not working with typescript 3.1.x ([#27402](https://github.com/angular/angular/issues/27402)) ([a9f39a4](https://github.com/angular/angular/commit/a9f39a4))
+
+
+
+<a name="7.1.2"></a>
+## [7.1.2](https://github.com/angular/angular/compare/7.1.1...7.1.2) (2018-12-06)
+
+
+### Bug Fixes
+
+* **bazel:** do not throw error when writing tsickle externs ([#27200](https://github.com/angular/angular/issues/27200)) ([079c4b3](https://github.com/angular/angular/commit/079c4b3))
+* **bazel:** do not throw if ts compile action does not create esm5 outputs ([#27401](https://github.com/angular/angular/issues/27401)) ([9b4d959](https://github.com/angular/angular/commit/9b4d959))
+* **bazel:** ng_package cannot be run multiple times without clean ([#27200](https://github.com/angular/angular/issues/27200)) ([1ca2923](https://github.com/angular/angular/commit/1ca2923))
+* **bazel:** ng_package not generating UMD bundles on windows ([#27200](https://github.com/angular/angular/issues/27200)) ([e476c38](https://github.com/angular/angular/commit/e476c38))
+* **bazel:** ng_package should correctly map to source maps in secondary entry-points ([#27313](https://github.com/angular/angular/issues/27313)) ([fc2c23e](https://github.com/angular/angular/commit/fc2c23e)), closes [#25510](https://github.com/angular/angular/issues/25510)
+* **compiler-cli:** flatModuleIndex files not generated on windows with multiple input files ([#27200](https://github.com/angular/angular/issues/27200)) ([8087b6b](https://github.com/angular/angular/commit/8087b6b))
+* **compiler-cli:** ngtsc shim files not being generated on case-insensitive platforms ([#27466](https://github.com/angular/angular/issues/27466)) ([84f2928](https://github.com/angular/angular/commit/84f2928)), closes [/github.com/Microsoft/TypeScript/blob/3e4c5c95abd515eb9713b881d27ab3a93cc00461/src/compiler/sys.ts#L681-L682](https://github.com//github.com/Microsoft/TypeScript/blob/3e4c5c95abd515eb9713b881d27ab3a93cc00461/src/compiler/sys.ts/issues/L681-L682)
+* **platform-server:** add [@angular](https://github.com/angular)/http to the list of peerDependencies ([#27307](https://github.com/angular/angular/issues/27307)) ([236ac06](https://github.com/angular/angular/commit/236ac06)), closes [#26154](https://github.com/angular/angular/issues/26154)
+
+
 <a name="7.2.0-beta.1"></a>
 # [7.2.0-beta.1](https://github.com/angular/angular/compare/7.1.0...7.2.0-beta.1) (2018-12-06)
 
@@ -29,21 +114,6 @@
 * **router:** allow passing state to `NavigationExtras` ([#27198](https://github.com/angular/angular/issues/27198)) ([67f4a5d](https://github.com/angular/angular/commit/67f4a5d))
 * **router:** restore whole  object when navigating back to a page managed by Angular router ([#27198](https://github.com/angular/angular/issues/27198)) ([2684249](https://github.com/angular/angular/commit/2684249))
 
-
-### BREAKING CHANGES
-
-* **bazel:** Bazel users: rules_angular_dependencies() will no longer install transitive dependencies of build_bazel_rules_nodejs and build_bazel_rules_typescript. User WORKSPACE files will now need to install rules_nodejs and rules_typescript transitive deps directly:
-
-```
-load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
-rules_typescript_dependencies()
-
-load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
-rules_nodejs_dependencies()
-```
-
-
-
 <a name="7.2.0-beta.0"></a>
 # [7.2.0-beta.0](https://github.com/angular/angular/compare/7.1.0...7.2.0-beta.0) (2018-11-28)
 

CONTRIBUTING.md

@@ -51,19 +51,15 @@ and help you to craft the change so that it is successfully accepted into the pr
 
 Before you submit an issue, please search the issue tracker, maybe an issue for your problem already exists and the discussion might inform you of workarounds readily available.
 
-We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it. In order to reproduce bugs, we will systematically ask you to provide a minimal reproduction scenario using http://plnkr.co. Having a live, reproducible scenario gives us a wealth of important information without going back & forth to you with additional questions like:
+We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it. In order to reproduce bugs, we will systematically ask you to provide a minimal reproduction. Having a minimal reproducible scenario gives us a wealth of important information without going back & forth to you with additional questions.
 
-- version of Angular used
-- 3rd-party libraries and their versions
-- and most importantly - a use-case that fails
+A minimal reproduction allows us to quickly confirm a bug (or point out a coding problem) as well as confirm that we are fixing the right problem.
 
-A minimal reproduce scenario using http://plnkr.co/ allows us to quickly confirm a bug (or point out coding problem) as well as confirm that we are fixing the right problem. If plunker is not a suitable way to demonstrate the problem (for example for issues related to our npm packaging), please create a standalone git repository demonstrating the problem.
-
-We will be insisting on a minimal reproduce scenario in order to save maintainers time and ultimately be able to fix more bugs. Interestingly, from our experience users often find coding problems themselves while preparing a minimal plunk. We understand that sometimes it might be hard to extract essentials bits of code from a larger code-base but we really need to isolate the problem before we can fix it.
+We will be insisting on a minimal reproduction scenario in order to save maintainers time and ultimately be able to fix more bugs. Interestingly, from our experience users often find coding problems themselves while preparing a minimal reproduction. We understand that sometimes it might be hard to extract essential bits of code from a larger code-base but we really need to isolate the problem before we can fix it.
 
 Unfortunately, we are not able to investigate / fix bugs without a minimal reproduction, so if we don't hear back from you we are going to close an issue that doesn't have enough info to be reproduced.
 
-You can file new issues by filling out our [new issue form](https://github.com/angular/angular/issues/new).
+You can file new issues by selecting from our [new issue templates](https://github.com/angular/angular/issues/new/choose) and filling out the issue template.
 
 
 ### <a name="submit-pr"></a> Submitting a Pull Request (PR)

WORKSPACE

@@ -1,11 +1,18 @@
 workspace(name = "angular")
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load(
     "//packages/bazel:package.bzl",
     "rules_angular_dependencies",
     "rules_angular_dev_dependencies",
 )
 
+http_archive(
+    name = "io_bazel_rules_go",
+    sha256 = "b7a62250a3a73277ade0ce306d22f122365b513f5402222403e507f2f997d421",
+    url = "https://github.com/bazelbuild/rules_go/releases/download/0.16.3/rules_go-0.16.3.tar.gz",
+)
+
 # Uncomment for local bazel rules development
 #local_repository(
 #    name = "build_bazel_rules_nodejs",
@@ -18,25 +25,28 @@ load(
 
 # Angular Bazel users will call this function
 rules_angular_dependencies()
+
+# Install transitive deps of rules_nodejs
+load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
+
+rules_nodejs_dependencies()
+
 # These are the dependencies only for us
 rules_angular_dev_dependencies()
 
 # Install transitive deps of rules_typescript
 load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
-rules_typescript_dependencies()
 
-# Install transitive deps of rules_nodejs
-load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
-rules_nodejs_dependencies()
+rules_typescript_dependencies()
 
 #
 # Point Bazel to WORKSPACEs that live in subdirectories
 #
 http_archive(
     name = "rxjs",
-    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
-    strip_prefix = "package/src",
     sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
+    strip_prefix = "package/src",
+    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
 )
 
 # Point to the integration test workspace just so that Bazel doesn't descend into it
@@ -51,9 +61,11 @@ local_repository(
 #
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 
-check_bazel_version("0.18.0", """
-If you are on a Mac and using Homebrew, there is a breaking change to the installation in Bazel 0.16
-See https://blog.bazel.build/2018/08/22/bazel-homebrew.html
+check_bazel_version("0.20.0", """
+You no longer need to install Bazel on your machine.
+Angular has a dependency on the @bazel/bazel package which supplies it.
+Try running `yarn bazel` instead.
+    (If you did run that, check that you've got a fresh `yarn install`)
 
 """)
 
@@ -69,7 +81,7 @@ local_repository(
     path = "tools/npm_workspace",
 )
 
-load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
+load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
 
 go_rules_dependencies()
 

aio/angular.json

@@ -2,7 +2,10 @@
   "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
   "version": 1,
   "cli": {
-    "packageManager": "yarn"
+    "packageManager": "yarn",
+    "warnings": {
+      "typescriptMismatch": false
+    }
   },
   "newProjectRoot": "projects",
   "projects": {

aio/content/cli/index.md

@@ -74,7 +74,10 @@ Command syntax is shown as follows:
 * Option names are prefixed with a double dash (--).
     Option aliases are prefixed with a single dash (-).
     Arguments are not prefixed.
-    For example: `ng build my-app -c production`
+    For example: 
+    <code-example format="." language="bash">
+        ng build my-app -c production
+    </code-example>
 
 * Typically, the name of a generated artifact can be given as an argument to the command or specified with the --name option.
 

aio/content/guide/form-validation.md

@@ -302,7 +302,7 @@ After asynchronous validation begins, the form control enters a `pending` state.
 A common UI pattern is to show a spinner while the async validation is being performed. The following example presents how to achieve this with template-driven forms:
 
 ```html
-<input [(ngModel)}="name" #model="ngModel" appSomeAsyncValidator>
+<input [(ngModel)]="name" #model="ngModel" appSomeAsyncValidator>
 <app-spinner *ngIf="model.pending"></app-spinner>
 ```
 

aio/content/guide/testing.md

@@ -126,8 +126,8 @@ jobs:
           key: my-project-{{ .Branch }}-{{ checksum "package-lock.json" }}
           paths:
             - "node_modules"
-      - run: npm run test -- --single-run --no-progress --browser=ChromeHeadlessCI
-      - run: npm run e2e -- --no-progress --config=protractor-ci.conf.js
+      - run: npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
+      - run: npm run e2e -- --protractor-config=e2e/protractor-ci.conf.js
 ```
 
 This configuration caches `node_modules/` and uses [`npm run`](https://docs.npmjs.com/cli/run-script) to run CLI commands, because `@angular/cli` is not installed globally. 
@@ -167,8 +167,8 @@ install:
   - npm install
 
 script:
-  - npm run test -- --single-run --no-progress --browser=ChromeHeadlessCI
-  - npm run e2e -- --no-progress --config=protractor-ci.conf.js
+  - npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
+  - npm run e2e -- --protractor-config=e2e/protractor-ci.conf.js
 ```
 
 This does the same things as the Circle CI configuration, except that Travis doesn't come with Chrome, so we use Chromium instead.
@@ -201,7 +201,7 @@ customLaunchers: {
 },
 ```
 
-* Create a new file, `protractor-ci.conf.js`, in the root folder of your project, which extends the original `protractor.conf.js`:
+* In the root folder of your e2e tests project, create a new file named `protractor-ci.conf.js`. This new file extends the original `protractor.conf.js`.
 ```
 const config = require('./protractor.conf').config;
 
@@ -218,8 +218,8 @@ exports.config = config;
 Now you can run the following commands to use the `--no-sandbox` flag:
 
 <code-example language="sh" class="code-shell">
-  ng test --single-run --no-progress --browser=ChromeHeadlessCI
-  ng e2e --no-progress --config=protractor-ci.conf.js
+  ng test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
+  ng e2e -- --protractor-config=e2e/protractor-ci.conf.js
 </code-example>
 
 <div class="alert is-helpful">
@@ -238,7 +238,7 @@ Code coverage reports show you  any parts of our code base that may not be prope
 To generate a coverage report run the following command in the root of your project.
 
 <code-example language="sh" class="code-shell">
-  ng test --watch=false --code-coverage
+  ng test --no-watch --code-coverage
 </code-example>
 
 When  the tests are complete, the command creates a new `/coverage` folder in the project. Open the `index.html` file to see a report with your source code and code coverage values.

aio/content/guide/universal.md

@@ -385,7 +385,6 @@ Set up a webpack configuration to handle the Node Express `server.ts` file and s
 In your app root directory, create a webpack configuration file (`webpack.server.config.js`) that compiles the `server.ts` file and its dependencies into `dist/server.js`.
 
 <code-example format="." language="typescript" linenums="false">
-@NgModule({
 const path = require('path');
 const webpack = require('webpack');
 

aio/content/marketing/events.html

@@ -13,6 +13,12 @@
     </tr>
     </thead>
     <tbody>
+    <!-- ngAtlanta 2019 -->
+    <tr>
+      <th><a href="https://ng-atl.org/" title="ngAtlanta">ngAtlanta</a></th>
+      <td>Atlanta, Georgia</td>
+      <td>January 9 - 12, 2019</td>
+    </tr>
     </tbody>
   </table>
 

aio/content/marketing/resources.json

@@ -447,6 +447,12 @@
             "rev": true,
             "title": "Simple Quality UI",
             "url": "https://sq-ui.github.io/ng-sq-ui/#/"
+          },
+          "smart": {
+            "desc": "Web Components for Angular. Dependency-free Angular components for building modern and mobile-friendly web apps",
+            "rev": true,
+            "title": "Smart Web Components",
+            "url": "https://www.htmlelements.com/angular/"
           }
         }
       }
@@ -694,6 +700,12 @@
       "Workshops & Onsite Training": {
         "order": 2,
         "resources": {
+          "webucator": {
+            "desc": "Customized in-person instructor-led Angular training for private groups and public online instructor-led Angular classes.",
+            "rev": true,
+            "title": "Webucator",
+            "url": "https://www.webucator.com/webdev-training/angular-training"
+          },
           "-acceleb": {
             "desc": "Customized, Instructor-Led Angular Training",
             "rev": true,
@@ -782,6 +794,12 @@
             "title": "SFEIR School (French)",
             "url": "https://school.sfeir.com/project/sa200/"
           },
+          "zenika-angular": {
+            "desc": "Angular trainings delivered by Zenika (FRANCE)",
+            "rev": true,
+            "title": "Angular Trainings (French)",
+            "url": "https://training.zenika.com/fr/training/angular2/description"
+          },
           "formationjs": {
             "desc": "Angular onsite training in Paris (France). Monthly Angular workshops and custom onsite classes. We are focused on Angular, so we are always up to date.",
             "rev": true,

aio/content/navigation.json

@@ -741,7 +741,6 @@
     { "title": "v6", "url": "https://v6.angular.io" },
     { "title": "v5", "url": "https://v5.angular.io" },
     { "title": "v4", "url": "https://v4.angular.io" },
-    { "title": "v2", "url": "https://v2.angular.io" },
-    { "title": "AngularDart", "url": "https://webdev.dartlang.org/angular" }
+    { "title": "v2", "url": "https://v2.angular.io" }
   ]
 }

aio/content/tutorial/toh-pt5.md

@@ -17,7 +17,7 @@ When you’re done, users will be able to navigate the app like this:
 
 ## Add the `AppRoutingModule`
 
-An Angular best practice is to load and configure the router in a separate, top-level module
+In Angular, the best practice is to load and configure the router in a separate, top-level module
 that is dedicated to routing and imported by the root `AppModule`.
 
 By convention, the module class name is `AppRoutingModule` and it belongs in the `app-routing.module.ts` in the `src/app` folder.

aio/package.json

@@ -18,7 +18,7 @@
     "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 1c01b91c6",
+    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js 02d2ec250",
     "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",
@@ -97,7 +97,7 @@
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.10.0",
-    "@angular/cli": "^7.0.1",
+    "@angular/cli": "7.2.0-beta.2",
     "@angular/compiler": "^7.0.0",
     "@angular/compiler-cli": "^7.0.0",
     "@angular/language-service": "^7.0.0",
@@ -111,8 +111,8 @@
     "codelyzer": "~4.2.1",
     "cross-spawn": "^5.1.0",
     "css-selector-parser": "^1.3.0",
-    "dgeni": "^0.4.7",
-    "dgeni-packages": "^0.26.12",
+    "dgeni": "^0.4.11",
+    "dgeni-packages": "^0.27.0",
     "entities": "^1.1.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jasmine": "^2.2.0",
@@ -154,7 +154,7 @@
     "tree-kill": "^1.1.0",
     "ts-node": "^3.3.0",
     "tslint": "~5.9.1",
-    "typescript": "^3.1.3",
+    "typescript": "^3.2.2",
     "uglify-js": "^3.0.15",
     "unist-util-filter": "^0.2.1",
     "unist-util-source": "^1.0.1",

aio/src/app/custom-elements/code/pretty-printer.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { from as fromPromise, Observable } from 'rxjs';
+import { from, Observable } from 'rxjs';
 import { first, map, share } from 'rxjs/operators';
 
 import { Logger } from 'app/shared/logger.service';
@@ -20,7 +20,7 @@ export class PrettyPrinter {
   private prettyPrintOne: Observable<PrettyPrintOne>;
 
   constructor(private logger: Logger) {
-    this.prettyPrintOne = fromPromise(this.getPrettyPrintOne()).pipe(share());
+    this.prettyPrintOne = from(this.getPrettyPrintOne()).pipe(share());
   }
 
   private getPrettyPrintOne(): Promise<PrettyPrintOne> {

aio/src/app/custom-elements/elements-loader.ts

@@ -5,9 +5,10 @@ import {
   NgModuleRef,
 } from '@angular/core';
 import { ELEMENT_MODULE_PATHS_TOKEN } from './element-registry';
-import { from as fromPromise, Observable, of } from 'rxjs';
+import { from, Observable, of } from 'rxjs';
 import { createCustomElement } from '@angular/elements';
 
+
 @Injectable()
 export class ElementsLoader {
   /** Map of unregistered custom elements and their respective module paths to load. */
@@ -34,7 +35,7 @@ export class ElementsLoader {
 
     // Returns observable that completes when all discovered elements have been registered.
     const allRegistered = Promise.all(unregisteredSelectors.map(s => this.loadCustomElement(s)));
-    return fromPromise(allRegistered.then(() => undefined));
+    return from(allRegistered.then(() => undefined));
   }
 
   /** Loads and registers the custom element defined on the `WithCustomElement` module factory. */

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

@@ -1,5 +1,5 @@
 import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core';
-import { asapScheduler as asap, combineLatest, Subject } from 'rxjs';
+import { asapScheduler, combineLatest, Subject } from 'rxjs';
 import { startWith, subscribeOn, takeUntil } from 'rxjs/operators';
 
 import { ScrollService } from 'app/shared/scroll.service';
@@ -52,7 +52,7 @@ export class TocComponent implements OnInit, AfterViewInit, OnDestroy {
       // We use the `asap` scheduler because updates to `activeItemIndex` are triggered by DOM changes,
       // which, in turn, are caused by the rendering that happened due to a ChangeDetection.
       // Without asap, we would be updating the model while still in a ChangeDetection handler, which is disallowed by Angular.
-      combineLatest(this.tocService.activeItemIndex.pipe(subscribeOn(asap)), this.items.changes.pipe(startWith(this.items)))
+      combineLatest(this.tocService.activeItemIndex.pipe(subscribeOn(asapScheduler)), this.items.changes.pipe(startWith(this.items)))
           .pipe(takeUntil(this.onDestroy))
           .subscribe(([index, items]) => {
             this.activeIndex = index;

aio/src/app/layout/top-menu/top-menu.component.ts

@@ -5,7 +5,11 @@ import { NavigationNode } from 'app/navigation/navigation.service';
   selector: 'aio-top-menu',
   template: `
     <ul role="navigation">
-      <li *ngFor="let node of nodes"><a class="nav-link" [href]="node.url" [title]="node.title">{{ node.title }}</a></li>
+      <li *ngFor="let node of nodes">
+        <a class="nav-link" [href]="node.url" [title]="node.title">
+          <span class="nav-link-inner">{{ node.title }}</span>
+        </a>
+      </li>
     </ul>`
 })
 export class TopMenuComponent {

aio/src/styles/1-layouts/_top-menu.scss

@@ -147,15 +147,21 @@ aio-top-menu {
 
   a.nav-link {
     margin: 0;
-    padding: 24px 16px;
+    padding: 24px 0px;
     cursor: pointer;
 
-    &:focus {
-      background: rgba($white, 0.15);
-      border-radius: 4px;
-      outline: none;
+    .nav-link-inner {
       padding: 8px 16px;
     }
+
+    &:focus {
+      outline: none;
+
+      .nav-link-inner {
+        background: rgba($white, 0.15);
+        border-radius: 4px;
+      }
+    }
   }
 }
 

aio/src/tsconfig.app.json

@@ -14,6 +14,6 @@
     "**/*.spec.ts"
   ],
   "angularCompilerOptions": {
-    "preserveWhitespaces": false
+    "disableTypeScriptVersionCheck": true
   }
-}
+}

aio/yarn.lock

@@ -9,6 +9,14 @@
     "@angular-devkit/core" "7.0.1"
     rxjs "6.3.3"
 
+"@angular-devkit/architect@0.12.0-beta.2":
+  version "0.12.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.12.0-beta.2.tgz#8fa8e0c7173b49fa06a844de78bf03a7e23ab5fe"
+  integrity sha512-RKp1xeMene28Ae3v8zJz70shqwzLeW+oN+lIu5VRNTz1veHGxbRRTng45LQsuDjQfnErVSc0N4/uFj6ZW0rUGg==
+  dependencies:
+    "@angular-devkit/core" "7.2.0-beta.2"
+    rxjs "6.3.3"
+
 "@angular-devkit/build-angular@~0.10.0":
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.10.1.tgz#6eccfd2eec4778c65e6b38b20304bfa5f134a4f1"
@@ -89,11 +97,23 @@
     rxjs "6.3.3"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@7.0.1":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.0.1.tgz#ccd7c5349c08aaf6224a28881bfeeacaf0ee0307"
+"@angular-devkit/core@7.2.0-beta.2":
+  version "7.2.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.2.0-beta.2.tgz#bce756c9cabff24ec3d0f0aefe0e462e2a70de2e"
+  integrity sha512-aHvCxWifBWKEezARfNUgBQVcmKT42Mt8/1rnTVZcQF+YC/84Ad4L2B7NLwkXj8gkBsy+ghWJUzVrM0TvLlrQeQ==
   dependencies:
-    "@angular-devkit/core" "7.0.1"
+    ajv "6.5.3"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
+"@angular-devkit/schematics@7.2.0-beta.2":
+  version "7.2.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.2.0-beta.2.tgz#ef332966e66ae92f7a6a1169df7e5010928ab9c8"
+  integrity sha512-WEySXUS+0Vw9nVXTKzJfAcPcOIBk45tE1xs3MYk1BCbxEjT2QXWIDNDeBuNigvy3xQ5iQ2iWqXYwoFBUOrpEiQ==
+  dependencies:
+    "@angular-devkit/core" "7.2.0-beta.2"
     rxjs "6.3.3"
 
 "@angular/animations@^7.0.0":
@@ -110,18 +130,18 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/cli@^7.0.1":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.0.1.tgz#77811e468bfa8208e01398a81e793b25be75bc14"
+"@angular/cli@7.2.0-beta.2":
+  version "7.2.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.2.0-beta.2.tgz#50ca5e2bd3642be72f5e6cf686c81af0b2ed3cbb"
+  integrity sha512-Id/nYyZa/0LQDkYhN3XyO7YL1kzIK3PPwM336kyXQSdDvh4ZANxqbinSTPozgl5LrmIOByf4BxqZ4Fs8Br5S3A==
   dependencies:
-    "@angular-devkit/architect" "0.10.1"
-    "@angular-devkit/core" "7.0.1"
-    "@angular-devkit/schematics" "7.0.1"
-    "@schematics/angular" "7.0.1"
-    "@schematics/update" "0.10.1"
+    "@angular-devkit/architect" "0.12.0-beta.2"
+    "@angular-devkit/core" "7.2.0-beta.2"
+    "@angular-devkit/schematics" "7.2.0-beta.2"
+    "@schematics/angular" "7.2.0-beta.2"
+    "@schematics/update" "0.12.0-beta.2"
     inquirer "6.2.0"
     opn "5.3.0"
-    rxjs "6.3.3"
     semver "5.5.1"
     symbol-observable "1.2.0"
 
@@ -288,21 +308,25 @@
     tree-kill "1.2.0"
     webpack-sources "1.2.0"
 
-"@schematics/angular@7.0.1":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.0.1.tgz#17ba40fe9665c60bcaa9a3cf722baf0862cf9b94"
+"@schematics/angular@7.2.0-beta.2":
+  version "7.2.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.2.0-beta.2.tgz#e4015906cfc2cf40c9bd1eed3f7b8fcfc34133f4"
+  integrity sha512-s1grejDByxqRdLRSnHZsDZgQeoMTyyBx4HHMgMkFj//ZBO8Q6Sx02Lu4zybgg6DQuVf/DDAMi9Gl9uRR4PHdKw==
   dependencies:
-    "@angular-devkit/core" "7.0.1"
-    "@angular-devkit/schematics" "7.0.1"
-    typescript "3.1.3"
+    "@angular-devkit/core" "7.2.0-beta.2"
+    "@angular-devkit/schematics" "7.2.0-beta.2"
+    typescript "3.1.6"
 
-"@schematics/update@0.10.1":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.10.1.tgz#bbadb151aa3f71fbac22e63778c11cc060e6bc6d"
+"@schematics/update@0.12.0-beta.2":
+  version "0.12.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.12.0-beta.2.tgz#dd9a4e9b2baa217db5071f6dd91f129c5952f4a6"
+  integrity sha512-7jREVAInNJKKOwjgrwUO41u34EL1iLiXmmMtYU5JSRRQzFGXxiYiO6dUViu8wBfo03a3DLPPMnnaP4BU3HUShg==
   dependencies:
-    "@angular-devkit/core" "7.0.1"
-    "@angular-devkit/schematics" "7.0.1"
-    npm-registry-client "8.6.0"
+    "@angular-devkit/core" "7.2.0-beta.2"
+    "@angular-devkit/schematics" "7.2.0-beta.2"
+    "@yarnpkg/lockfile" "1.1.0"
+    ini "1.3.5"
+    pacote "9.1.1"
     rxjs "6.3.3"
     semver "5.5.1"
     semver-intersect "1.4.0"
@@ -498,6 +522,11 @@
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
 
+"@yarnpkg/lockfile@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
 JSONStream@^1.2.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
@@ -505,6 +534,14 @@ JSONStream@^1.2.1:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
+JSONStream@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
 a-sync-waterfall@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/a-sync-waterfall/-/a-sync-waterfall-1.0.0.tgz#38e8319d79379e24628845b53b96722b29e0e47c"
@@ -603,6 +640,20 @@ agent-base@2:
     extend "~3.0.0"
     semver "~5.0.1"
 
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agentkeepalive@^3.4.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
+  dependencies:
+    humanize-ms "^1.2.1"
+
 ajv-errors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
@@ -1203,6 +1254,11 @@ bluebird@^3.3.0, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
+bluebird@^3.5.2:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
+  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
@@ -1442,6 +1498,26 @@ cacache@^10.0.4:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
+cacache@^11.0.1, cacache@^11.2.0:
+  version "11.3.1"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.1.tgz#d09d25f6c4aca7a6d305d141ae332613aa1d515f"
+  integrity sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA==
+  dependencies:
+    bluebird "^3.5.1"
+    chownr "^1.0.1"
+    figgy-pudding "^3.1.0"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    lru-cache "^4.1.3"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^6.0.0"
+    unique-filename "^1.1.0"
+    y18n "^4.0.0"
+
 cacache@^11.0.2:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
@@ -1539,7 +1615,7 @@ canonical-path@0.0.2, canonical-path@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-0.0.2.tgz#e31eb937a8c93ee2a01df1839794721902874574"
 
-canonical-path@1.0.0:
+canonical-path@1.0.0, canonical-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
 
@@ -1680,7 +1756,7 @@ chokidar@2.0.4:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chokidar@^1.4.1, chokidar@^1.4.2, chokidar@^1.6.0:
+chokidar@^1.4.1, chokidar@^1.4.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1717,6 +1793,11 @@ chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
 
+chownr@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
+  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
+
 chrome-devtools-frontend@1.0.401423:
   version "1.0.401423"
   resolved "https://registry.yarnpkg.com/chrome-devtools-frontend/-/chrome-devtools-frontend-1.0.401423.tgz#32a89b8d04e378a494be3c8d63271703be1c04ea"
@@ -2447,7 +2528,7 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-debug@*, debug@=3.1.0, debug@^3.1.0:
+debug@*, debug@3.1.0, debug@=3.1.0, debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
@@ -2595,7 +2676,7 @@ depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
-dependency-graph@^0.7.2:
+dependency-graph@^0.7.0, dependency-graph@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
 
@@ -2641,11 +2722,12 @@ devtools-timeline-model@1.1.6:
     chrome-devtools-frontend "1.0.401423"
     resolve "1.1.7"
 
-dgeni-packages@^0.26.12:
-  version "0.26.12"
-  resolved "https://registry.yarnpkg.com/dgeni-packages/-/dgeni-packages-0.26.12.tgz#6b8329b59a17213d30137b53a689d579cd6a9fb1"
+dgeni-packages@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/dgeni-packages/-/dgeni-packages-0.27.0.tgz#99ddf4c97f75bb1f8deb5658ed7d60f6894e9b9d"
+  integrity sha512-BFWJGZTpLb1xAc/iHq7SOcbkyEoxD57NqVG84azfNu63wAVLxoez/9n8VISWNJkrOIT1ITQS7nacgcGxfl0MIw==
   dependencies:
-    canonical-path "0.0.2"
+    canonical-path "^1.0.0"
     catharsis "^0.8.1"
     change-case "3.0.0"
     dgeni "^0.4.9"
@@ -2659,16 +2741,31 @@ dgeni-packages@^0.26.12:
     mkdirp "^0.5.1"
     mkdirp-promise "^5.0.0"
     node-html-encoder "0.0.2"
-    nunjucks "^3.0.1"
+    nunjucks "^3.1.6"
     semver "^5.2.0"
     shelljs "^0.7.0"
     source-map-support "^0.4.15"
     spdx-license-list "^2.1.0"
     stringmap "^0.2.2"
-    typescript "~2.7.1"
+    typescript "^3.2.2"
     urlencode "^1.1.0"
 
-dgeni@^0.4.7, dgeni@^0.4.9:
+dgeni@^0.4.11:
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/dgeni/-/dgeni-0.4.11.tgz#5fe416801cef1f2ae759fda8330b2fbdd0459341"
+  integrity sha512-4QLCXdo/uaRDhej2VLvWPEX5ACyLBsxEQflOkTmvoGYnYhQperOc8gMiZ1IW5GDeYL+fTqZ/kKGCbMukTfCrEg==
+  dependencies:
+    canonical-path "~0.0.2"
+    dependency-graph "^0.7.0"
+    di "0.0.1"
+    lodash "^4.17.10"
+    objectdiff "^1.1.0"
+    optimist "~0.6.1"
+    q "^1.5.1"
+    validate.js "^0.12.0"
+    winston "^2.1.1"
+
+dgeni@^0.4.9:
   version "0.4.9"
   resolved "https://registry.yarnpkg.com/dgeni/-/dgeni-0.4.9.tgz#9e42775b1386ca5eb824753ac2cd169d8f61ced1"
   dependencies:
@@ -2896,6 +2993,13 @@ encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
 
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
+  dependencies:
+    iconv-lite "~0.4.13"
+
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
@@ -2957,6 +3061,11 @@ entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
+err-code@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
+
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -3027,10 +3136,22 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
+es6-promise@^4.0.3:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
+
 es6-promise@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
 
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
+  dependencies:
+    es6-promise "^4.0.3"
+
 es6-set@^0.1.4, es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -3485,7 +3606,7 @@ faye-websocket@^0.10.0:
   dependencies:
     websocket-driver ">=0.5.1"
 
-figgy-pudding@^3.1.0, figgy-pudding@^3.5.1:
+figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
 
@@ -3916,6 +4037,11 @@ generate-object-property@^1.1.0:
   dependencies:
     is-property "^1.0.0"
 
+genfun@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
+  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
+
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -3928,6 +4054,13 @@ get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+get-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -3987,7 +4120,7 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.3:
+glob@7.1.3, glob@^7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   dependencies:
@@ -4523,7 +4656,7 @@ htmlparser2@^3.7.3:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
-http-cache-semantics@3.8.1:
+http-cache-semantics@3.8.1, http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
 
@@ -4557,6 +4690,14 @@ http-parser-js@>=0.4.0:
   version "0.4.9"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1"
 
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
 http-proxy-middleware@~0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
@@ -4615,6 +4756,21 @@ https-proxy-agent@^1.0.0:
     debug "2"
     extend "3"
 
+https-proxy-agent@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
+  dependencies:
+    agent-base "^4.1.0"
+    debug "^3.1.0"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
+  dependencies:
+    ms "^2.0.0"
+
 i@0.3.x:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/i/-/i-0.3.6.tgz#d96c92732076f072711b6b10fd7d4f65ad8ee23d"
@@ -4633,7 +4789,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   dependencies:
@@ -4740,6 +4896,11 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
+ini@1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
@@ -5459,7 +5620,7 @@ json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
 
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
 
@@ -6062,6 +6223,14 @@ lru-cache@^4.1.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^4.1.2:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
 lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
@@ -6095,6 +6264,23 @@ make-error@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96"
 
+make-fetch-happen@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
+  integrity sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^11.0.1"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^4.0.0"
+    ssri "^6.0.0"
+
 mamacro@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
@@ -6400,12 +6586,27 @@ minipass@^2.3.3:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
+minipass@^2.3.4, minipass@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
 minizlib@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.1.tgz#6734acc045a46e61d596a43bb9d9cd326e19cc42"
   dependencies:
     minipass "^2.2.1"
 
+minizlib@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
+  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+  dependencies:
+    minipass "^2.2.1"
+
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
@@ -6499,7 +6700,7 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
-ms@^2.1.1:
+ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
 
@@ -6594,6 +6795,15 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
+node-fetch-npm@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==
+  dependencies:
+    encoding "^0.1.11"
+    json-parse-better-errors "^1.0.0"
+    safe-buffer "^5.1.1"
+
 node-forge@0.7.1, node-forge@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.1.tgz#9da611ea08982f4b94206b3beb4cc9665f20c300"
@@ -6734,7 +6944,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, "normalize-package-data@~1.0.1 || ^2.0.0":
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -6765,39 +6975,43 @@ npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
 
-"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0":
+npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
   dependencies:
     hosted-git-info "^2.6.0"
     osenv "^0.1.5"
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^1.1.6:
+npm-packlist@^1.1.12, npm-packlist@^1.1.6:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-registry-client@8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
+npm-pick-manifest@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
+  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
   dependencies:
-    concat-stream "^1.5.2"
-    graceful-fs "^4.1.6"
-    normalize-package-data "~1.0.1 || ^2.0.0"
-    npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
-    once "^1.3.3"
-    request "^2.74.0"
-    retry "^0.10.0"
-    safe-buffer "^5.1.1"
-    semver "2 >=2.2.1 || 3.x || 4 || 5"
-    slide "^1.1.3"
-    ssri "^5.2.4"
-  optionalDependencies:
-    npmlog "2 || ^3.1.0 || ^4.0.0"
+    figgy-pudding "^3.5.1"
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
+npm-registry-fetch@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
+  integrity sha512-hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw==
+  dependencies:
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    npm-package-arg "^6.1.0"
 
 npm-run-all@^4.1.5:
   version "4.1.5"
@@ -6820,7 +7034,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
@@ -6841,15 +7055,17 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-nunjucks@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.0.1.tgz#4de74a3e550baf6fa3370323f3d1c7c2a86bdc4d"
+nunjucks@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.1.6.tgz#6e3a3420c77ceae937ae323e9e2995383d6410fb"
+  integrity sha512-aHCt5arZUqHnRNjfDBCq+fI/O3J2sxx+xZdz6mCNvwAgJVCtHM/VAv2++figjGeFyrZ1dVcJ1dCJwMxY8iYoqQ==
   dependencies:
     a-sync-waterfall "^1.0.0"
     asap "^2.0.3"
+    postinstall-build "^5.0.1"
     yargs "^3.32.0"
   optionalDependencies:
-    chokidar "^1.6.0"
+    chokidar "^2.0.0"
 
 "nwmatcher@>= 1.3.9 < 2.0.0":
   version "1.4.3"
@@ -7119,6 +7335,39 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
+pacote@9.1.1:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.1.tgz#25091f75a25021de8be8d34cc6408728fca3579b"
+  integrity sha512-f28Rq5ozzKAA9YwIKw61/ipwAatUZseYmVssDbHHaexF0wRIVotapVEZPAjOT7Eu3LYVqEp0NVpNizoAnYBUaA==
+  dependencies:
+    bluebird "^3.5.2"
+    cacache "^11.2.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    minimatch "^3.0.4"
+    minipass "^2.3.5"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^2.1.0"
+    npm-registry-fetch "^3.8.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.1"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.6"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
+
 pako@~1.0.2, pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -7468,6 +7717,11 @@ postcss@^6.0.22:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
+postinstall-build@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postinstall-build/-/postinstall-build-5.0.3.tgz#238692f712a481d8f5bc8960e94786036241efc7"
+  integrity sha512-vPvPe8TKgp4FLgY3+DfxCE5PIfoXBK2lyLfNCxsRbDsV6vS4oU5RG/IWxrblMn6heagbnMED3MemUQllQ2bQUg==
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -7508,6 +7762,14 @@ promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
 
+promise-retry@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
+  dependencies:
+    err-code "^1.0.0"
+    retry "^0.10.0"
+
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -7535,6 +7797,13 @@ protochain@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/protochain/-/protochain-1.0.5.tgz#991c407e99de264aadf8f81504b5e7faf7bfa260"
 
+protoduck@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
+  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
+  dependencies:
+    genfun "^5.0.0"
+
 protractor@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.2.0.tgz#d3f39b195e85f3539ad9d8cb6560a9d2b63297c4"
@@ -7638,7 +7907,7 @@ q@1.4.1, q@~1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
-q@^1.4.1:
+q@^1.4.1, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
@@ -8541,18 +8810,23 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@5.5.0, semver@^5.0.0, semver@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-
 "semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.2.0, semver@^5.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
 
+semver@5.5.0, semver@^5.0.0, semver@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+
 semver@5.5.1:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
 
+semver@^5.4.1, semver@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+
 semver@~4.3.3:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
@@ -8721,10 +8995,15 @@ slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
-slide@^1.1.3, slide@^1.1.5:
+slide@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
+smart-buffer@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
+  integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==
+
 snake-case@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
@@ -8836,6 +9115,22 @@ sockjs@0.3.19:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
+socks-proxy-agent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
+  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
+  dependencies:
+    agent-base "~4.2.0"
+    socks "~2.2.0"
+
+socks@~2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.2.tgz#f061219fc2d4d332afb4af93e865c84d3fa26e2b"
+  integrity sha512-g6wjBnnMOZpE0ym6e0uHSddz9p3a+WsBaaYQaBaSCJYvrC4IXykQR9MNGjLQf38e9iIIhp3b1/Zk8YZI3KGJ0Q==
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "^4.0.1"
+
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
@@ -9024,7 +9319,7 @@ ssri@^5.2.4:
   dependencies:
     safe-buffer "^5.1.1"
 
-ssri@^6.0.0:
+ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
   dependencies:
@@ -9399,6 +9694,19 @@ tar@^4, tar@^4.3.0:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
+tar@^4.4.6:
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
+  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.4"
+    minizlib "^1.1.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
 taskgroup@^4.0.5:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/taskgroup/-/taskgroup-4.3.1.tgz#7de193febd768273c457730497024d512c27915a"
@@ -9733,17 +10041,23 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@3.1.3, typescript@^3.1.3:
+typescript@3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.3.tgz#01b70247a6d3c2467f70c45795ef5ea18ce191d5"
 
+typescript@3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
+  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
+
 typescript@^2.4.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
 
-typescript@~2.7.1:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
+typescript@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
+  integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==
 
 uglify-es@^3.3.4:
   version "3.3.9"
@@ -9858,6 +10172,13 @@ unique-filename@^1.1.0:
   dependencies:
     unique-slug "^2.0.0"
 
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
 unique-slug@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
@@ -10157,6 +10478,11 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
+validate.js@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/validate.js/-/validate.js-0.12.0.tgz#17f989e37c192ea2f826bbf19bf4e97e6e4be68f"
+  integrity sha512-/x2RJSvbqEyxKj0RPN4xaRquK+EggjeVXiDDEyrJzsJogjtiZ9ov7lj/svVb4DM5Q5braQF4cooAryQbUwOxlA==
+
 validate.js@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/validate.js/-/validate.js-0.9.0.tgz#8acf0144f1520a19835c6cc663f45e0836aa56c8"
@@ -10474,6 +10800,13 @@ which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
+which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"

docs/BAZEL.md

@@ -88,28 +88,12 @@ First time setup:
 - Add the following to the `configurations` array:
 
 ```json
-        {
-            "name": "Attach (inspect)",
-            "type": "node",
-            "request": "attach",
-            "port": 9229,
-            "address": "localhost",
-            "restart": false,
-            "sourceMaps": true,
-            "localRoot": "${workspaceRoot}",
-            "remoteRoot": null
-        },
-        {
-            "name": "Attach (no-sm,inspect)",
-            "type": "node",
-            "request": "attach",
-            "port": 9229,
-            "address": "localhost",
-            "restart": false,
-            "sourceMaps": false,
-            "localRoot": "${workspaceRoot}",
-            "remoteRoot": null
-        },
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attach to Remote",
+      "port": 9229,
+    }
 ```
 
 **Setting breakpoints directly in your code files may not work in VSCode**. This is because the files you're actually debugging are built files that exist in a `./private/...` folder.
@@ -118,7 +102,7 @@ and launch the bazel corresponding test (`yarn bazel test <target> --config=debu
 
 Bazel will wait on a connection. Go to the debug view (by clicking on the sidebar or
 Apple+Shift+D on Mac) and click on the green play icon next to the configuration name
-(ie `Attach (inspect)`).
+(ie `Attach to Remote`).
 
 ### Debugging a Karma Test
 

docs/COMMITTER.md

@@ -8,7 +8,7 @@ Someone with committer access will do the rest.
 
 # Change approvals
 
-Change approvals in our monorepo are managed via [pullapprove.com](https://about.pullapprove.com/) and are configured via the `.pullapprove.yaml` file.
+Change approvals in our monorepo are managed via [GitHub CODEOWNERS](https://help.github.com/articles/about-codeowners/) and are configured via the `.github/CODEOWNERS` file.
 
 
 # Merging

docs/SAVED_REPLIES.md

@@ -5,43 +5,44 @@ The following are canned responses that the Angular team should use to close iss
 Since GitHub currently doesn't allow us to have a repository-wide or organization-wide list of [saved replies](https://help.github.com/articles/working-with-saved-replies/), these replies need to be maintained by individual team members. Since the responses can be modified in the future, all responses are versioned to simplify the process of keeping the responses up to date.
 
 
-## Angular: Already Fixed (v2)
+## Angular: Already Fixed (v3)
 ```
 Thanks for reporting this issue. Luckily it has already been fixed in one of the recent releases. Please update to the most recent version to resolve the problem.
 
-If after upgrade the problem still exists in your application please open a new issue and provide a StackBlitz reproducing the problem and describing the difference between the expected and current behavior. You can use this StackBlitz template: https://stackblitz.com/fork/angular-gitter
+If after upgrade the problem still exists in your application please [open a new issue](https://github.com/angular/angular/issues/new/choose) and follow the instructions in the issue template.
 ```
 
-## Angular: Don't Understand (v2)
+## Angular: Don't Understand (v3)
 ```
 I'm sorry but we don't understand the problem you are reporting.
 
-If the problem still exists please open a new issue and provide a StackBlitz reproducing the problem and describing the difference between the expected and current behavior. You can use this StackBlitz template: https://stackblitz.com/fork/angular-gitter
+If the problem still exists in your application, please [open a new issue](https://github.com/angular/angular/issues/new/choose) and follow the instructions in the issue template.
 ```
 
-## Angular: StackBlitz Needed (v1)
+## Angular: Can't reproduce (v2)
 ```
-I'm sorry but reported issues require a StackBlitz reproducing the problem.
+I'm sorry but we can't reproduce the problem you are reporting. We require that reported issues have a minimal reproduction that showcases the problem.
 
-If this issue persists, please create a StackBlitz using this template and describe the difference between the expected and current behavior and create a new issue: https://stackblitz.com/fork/angular-gitter
+If the problem still exists in your application, please [open a new issue](https://github.com/angular/angular/issues/new/choose) and follow the instructions in the issue template that include info on how to create a reproduction using our template.
 ```
 
-## Angular: Duplicate (v1)
+## Angular: Duplicate (v2)
 ```
-Thanks for reporting this issue. However this issue is a duplicate of an existing issue #<ISSUE_NUMBER>. Please subscribe to that issue for future updates.
+Thanks for reporting this issue. However this issue is a duplicate of an existing issue #ISSUE_NUMBER. Please subscribe to that issue for future updates.
 ```
 
 
-## Angular: Insufficient Information Provided (v1)
+## Angular: Insufficient Information Provided (v2)
 ```
 Thanks for reporting this issue. However, you didn't provide sufficient information for us to understand and reproduce the problem. Please check out [our submission guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-submitting-an-issue) to understand why we can't act on issues that are lacking important information.
 
-If the problem still persists, please file a new issue and ensure you provide all of the required information when filling out the issue template.
+If the problem still exists in your application, please [open a new issue](https://github.com/angular/angular/issues/new/choose) and follow the instructions in the issue template.
+
 ```
 
-## Angular: Issue Outside of Angular (v1)
+## Angular: Issue Outside of Angular (v2)
 ```
-I'm sorry but this issue is not caused by Angular. Please contact the author(s) of project <PROJECT NAME> or file issue on their issue tracker.
+I'm sorry but this issue is not caused by Angular. Please contact the author(s) of project PROJECT_NAME or file issue on their issue tracker.
 ```
 
 ## Angular: Behaving as Expected (v1)
@@ -49,18 +50,18 @@ I'm sorry but this issue is not caused by Angular. Please contact the author(s)
 It appears this behaves as expected. If you still feel there is an issue, please provide further details in a new issue.
 ```
 
-## Angular: Non-reproducible (v1)
+## Angular: Non-reproducible (v2)
 ```
 I'm sorry but we can't reproduce the problem following the instructions you provided.
 
-If the problem still exists please open a new issue following [our submission guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-submitting-an-issue).
+If the problem still exists in your application please [open a new issue](https://github.com/angular/angular/issues/new/choose) and follow the instructions in the issue template.
 ```
 
-## Angular: Obsolete (v1)
+## Angular: Obsolete (v2)
 ```
 Thanks for reporting this issue. This issue is now obsolete due to changes in the recent releases. Please update to the most recent Angular version.
 
-If the problem still persists, please file a new issue and ensure you provide the version of Angular affected and include the steps to reproduce the problem when filling out the issue template.
+If the problem still exists in your application, please [open a new issue](https://github.com/angular/angular/issues/new/choose) and follow the instructions in the issue template.
 ```
 
 

docs/TRIAGE_AND_LABELS.md

@@ -145,7 +145,7 @@ If a PR is missing the "PR target: *" label, or if the label is set to "TBD" whe
 
 Before a PR can be merged it must be approved by the appropriate reviewer(s).
 
-To ensure that there right people review each change, we configured [PullApprove bot](https://about.pullapprove.com/) via (`.pullapprove.yaml`) to provide aggregate approval state via the GitHub PR Status API.
+To ensure that the right people review each change, we configured [GitHub CODEOWNERS](https://help.github.com/articles/about-codeowners/) (via `.github/CODEOWNERS`) and require that each PR has at least one approval from the appropriate code owner.
 
 Note that approved state does not mean a PR is ready to be merged.
 For example, a reviewer might approve the PR but request a minor tweak that doesn't need further review, e.g., a rebase or small uncontroversial change.

integration/bazel-schematics/angular.json.original

@@ -0,0 +1,135 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "demo": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {},
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/demo",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "demo:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "demo:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "demo:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "karmaConfig": "src/karma.conf.js",
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": [],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "demo-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "prefix": "",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "demo:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "demo:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "demo"
+}

integration/bazel-schematics/app.e2e-spec.ts

@@ -0,0 +1,20 @@
+import { AppPage } from './app.po';
+import { browser } from 'protractor';
+
+describe('workspace-project App', () => {
+  let page: AppPage;
+
+  beforeEach(() => {
+    page = new AppPage();
+  });
+
+  it('should display welcome message', () => {
+    page.navigateTo();
+    expect(page.getTitleText()).toEqual('Welcome to demo!');
+  });
+
+  afterEach(async () => {
+    const logs = await browser.manage().logs().get('browser');
+    expect(logs).toEqual([]);
+  });
+});

integration/bazel-schematics/index.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Demo</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <app-root></app-root>
+</body>
+</html>

integration/bazel-schematics/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "bazel-schematics",
+  "version": "1.0.0",
+  "main": "index.js",
+  "license": "MIT",
+  "devDependencies": {
+    "@angular/bazel": "file:../../dist/packages-dist/bazel",
+    "@angular/cli": "^7.1.3",
+    "@angular/core": "^7.1.3",
+    "@bazel/bazel": "file:../../node_modules/@bazel/bazel"
+  },
+  "scripts": {
+    "test": "./test.sh"
+  }
+}

integration/bazel-schematics/test.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -eux -o pipefail
+
+function testBazel() {
+  # Set up
+  bazel version
+  rm -rf demo
+  # Create project
+  ng new demo --collection=@angular/bazel --defaults --skip-git
+  cd demo
+  # Run build
+  # TODO(kyliau): Use `bazel build` for now. Running `ng build` requires
+  # node_modules to be available in project directory.
+  bazel build //src:bundle
+  # Run test
+  ng test
+  ng e2e
+}
+
+function testNonBazel() {
+  # Replace angular.json that uses Bazel builder with the default generated by CLI
+  cp ../angular.json.original ./angular.json
+  # TODO(kyliau) Remove this once the additional assertion is added to CLI
+  cp ../app.e2e-spec.ts ./e2e/src/
+  # TODO(kyliau) Remove this once web_package rule is in use
+  cp ../index.html ./src/
+  rm -rf dist src/main.dev.ts src/main.prod.ts
+  # Just make a symlink instead of full yarn install to expose node_modules
+  ln -s $(bazel info output_base)/external/npm/node_modules node_modules
+  ng build
+  ng test --watch=false
+  ng e2e
+}
+
+testBazel
+testNonBazel

integration/bazel/WORKSPACE

@@ -1,5 +1,7 @@
 workspace(name = "bazel_integration_test")
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 #
 # Download Bazel toolchain dependencies as needed by build actions
 #
@@ -11,9 +13,9 @@ local_repository(
 
 http_archive(
     name = "rxjs",
-    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
-    strip_prefix = "package/src",
     sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
+    strip_prefix = "package/src",
+    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
 )
 
 load("@angular//packages/bazel:package.bzl", "rules_angular_dependencies")
@@ -42,6 +44,7 @@ http_archive(
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 
 check_bazel_version("0.17.0")
+
 node_repositories(
     node_version = "10.9.0",
     yarn_version = "1.12.1",
@@ -53,14 +56,16 @@ yarn_install(
     yarn_lock = "//src:yarn.lock",
 )
 
-load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
+load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
 
 go_rules_dependencies()
+
 go_register_toolchains()
 
 load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories")
 
 web_test_repositories()
+
 browser_repositories(
     chromium = True,
     firefox = True,

integration/bazel/src/package.json

@@ -13,8 +13,8 @@
     "@angular/bazel": "file:../angular/dist/packages-dist/bazel",
     "@angular/compiler": "file:../angular/dist/packages-dist/compiler",
     "@angular/compiler-cli": "file:../angular/dist/packages-dist/compiler-cli",
-    "@bazel/karma": "0.21.0",
-    "@bazel/typescript": "0.21.0",
+    "@bazel/karma": "0.22.0",
+    "@bazel/typescript": "0.22.0",
     "@types/jasmine": "2.8.8",
     "@types/source-map": "0.5.1",
     "protractor": "5.1.2",

integration/cli-hello-world-ivy/.gitignore

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

integration/cli-hello-world-ivy/angular.json

@@ -76,6 +76,13 @@
             },
             "production": {
               "browserTarget": "cli-hello-world:build:production"
+            },
+            "ci": {
+              "progress": false
+            },
+            "ci-production": {
+              "browserTarget": "cli-hello-world:build:production",
+              "progress": false
             }
           }
         },
@@ -141,6 +148,12 @@
           "configurations": {
             "production": {
               "devServerTarget": "cli-hello-world:serve:production"
+            },
+            "ci": {
+              "devServerTarget": "cli-hello-world:serve:ci"
+            },
+            "ci-production": {
+              "devServerTarget": "cli-hello-world:serve:ci-production"
             }
           }
         },

integration/cli-hello-world-ivy/debug-test.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+##### Test Debug Utility #####
+##############################
+
+# Use this script to run the ngcc integration test locally
+# in isolation from the other integration tests.
+# This is useful when debugging the ngcc code-base.
+
+set -u -e -o pipefail
+
+cd "$(dirname "$0")"
+
+$(pwd)/../../scripts/build-packages-dist.sh
+
+# Workaround https://github.com/yarnpkg/yarn/issues/2165
+# Yarn will cache file://dist URIs and not update Angular code
+readonly cache=../.yarn_local_cache
+function rm_cache {
+  rm -rf $cache
+}
+rm_cache
+mkdir $cache
+trap rm_cache EXIT
+
+rm -rf dist
+rm -rf node_modules
+yarn install --cache-folder $cache
+yarn test

integration/cli-hello-world-ivy/package.json

@@ -3,13 +3,15 @@
   "version": "0.0.0",
   "license": "MIT",
   "scripts": {
-    "build": "ng build --prod --progress false",
-    "e2e": "ng e2e",
+    "build": "ng build --prod --progress=false",
+    "e2e": "ng e2e --webdriver-update=false",
     "lint": "ng lint",
     "ng": "ng",
-    "postinstall": "webdriver-manager update --gecko false --standalone false $CHROMEDRIVER_VERSION_ARG && yarn ivy-ngcc",
+    "postinstall": "webdriver-manager update --gecko=false --standalone=false $CHROMEDRIVER_VERSION_ARG && yarn ivy-ngcc",
     "start": "ng serve",
-    "test": "ng build --progress false"
+    "//test1": "TODO FW-813: Re-enable `ci-production`. Currently, it fails after a timeout as Protractor reports Angular cannot be found on the page",
+    "//test2": "ng test --progress=false --watch=false && yarn e2e --configuration=ci && yarn e2e --configuration=ci-production",
+    "test": "ng test --progress=false --watch=false && yarn e2e --configuration=ci"
   },
   "private": true,
   "dependencies": {
@@ -27,12 +29,12 @@
     "zone.js": "file:../../node_modules/zone.js"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.5.0",
-    "@angular/cli": "^6.0.0-rc.5",
+    "@angular-devkit/build-angular": "~0.10.3",
+    "@angular/cli": "7.0.3",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "@angular/language-service": "file:../../dist/packages-dist/language-service",
     "@types/jasmine": "~2.8.3",
-    "@types/jasminewd2": "~2.0.2",
+    "@types/jasminewd2": "~2.0.4",
     "@types/node": "~6.0.60",
     "codelyzer": "^4.3.0",
     "jasmine-core": "~2.8.0",

integration/cli-hello-world-ivy/src/app/app.component.html

@@ -5,7 +5,7 @@
   </h1>
   <img width="300" alt="Angular Logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
 </div>
-<p>{{ 100 | json }}% awesome</p>
+<p>{{ 1 | percent }} awesome</p>
 <h2>Here are some links to help you start: </h2>
 <ul>
   <li>

integration/typings_test_ts31/include-all.ts

@@ -6,6 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+
+
+import * as animations from '@angular/animations';
+import * as animationsBrowser from '@angular/animations/browser';
+import * as animationsBrowserTesting from '@angular/animations/browser/testing';
+import * as common from '@angular/common';
+import * as commonHttp from '@angular/common/http';
+import * as commonTesting from '@angular/common/testing';
+import * as commonHttpTesting from '@angular/common/testing';
 import * as compiler from '@angular/compiler';
 import * as compilerTesting from '@angular/compiler/testing';
 import * as core from '@angular/core';
@@ -15,18 +24,29 @@ import * as forms from '@angular/forms';
 import * as http from '@angular/http';
 import * as httpTesting from '@angular/http/testing';
 import * as platformBrowser from '@angular/platform-browser';
-import * as platformBrowserTesting from '@angular/platform-browser/testing';
 import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
+import * as platformBrowserDynamicTesting from '@angular/platform-browser-dynamic/testing';
+import * as platformBrowserAnimations from '@angular/platform-browser/animations';
+import * as platformBrowserTesting from '@angular/platform-browser/testing';
 import * as platformServer from '@angular/platform-server';
 import * as platformServerTesting from '@angular/platform-server/testing';
 import * as platformWebworker from '@angular/platform-webworker';
 import * as platformWebworkerDynamic from '@angular/platform-webworker-dynamic';
 import * as router from '@angular/router';
 import * as routerTesting from '@angular/router/testing';
+import * as routerUpgrade from '@angular/router/upgrade';
 import * as serviceWorker from '@angular/service-worker';
 import * as upgrade from '@angular/upgrade';
+import * as upgradeStatic from '@angular/upgrade/static';
 
 export default {
+  animations,
+  animationsBrowser,
+  animationsBrowserTesting,
+  common,
+  commonTesting,
+  commonHttp,
+  commonHttpTesting,
   compiler,
   compilerTesting,
   core,
@@ -38,12 +58,16 @@ export default {
   platformBrowser,
   platformBrowserTesting,
   platformBrowserDynamic,
+  platformBrowserDynamicTesting,
+  platformBrowserAnimations,
   platformServer,
   platformServerTesting,
   platformWebworker,
   platformWebworkerDynamic,
   router,
   routerTesting,
+  routerUpgrade,
   serviceWorker,
   upgrade,
+  upgradeStatic
 };

integration/typings_test_ts32/include-all.ts

@@ -0,0 +1,73 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+
+
+import * as animations from '@angular/animations';
+import * as animationsBrowser from '@angular/animations/browser';
+import * as animationsBrowserTesting from '@angular/animations/browser/testing';
+import * as common from '@angular/common';
+import * as commonHttp from '@angular/common/http';
+import * as commonTesting from '@angular/common/testing';
+import * as commonHttpTesting from '@angular/common/testing';
+import * as compiler from '@angular/compiler';
+import * as compilerTesting from '@angular/compiler/testing';
+import * as core from '@angular/core';
+import * as coreTesting from '@angular/core/testing';
+import * as elements from '@angular/elements';
+import * as forms from '@angular/forms';
+import * as http from '@angular/http';
+import * as httpTesting from '@angular/http/testing';
+import * as platformBrowser from '@angular/platform-browser';
+import * as platformBrowserDynamic from '@angular/platform-browser-dynamic';
+import * as platformBrowserDynamicTesting from '@angular/platform-browser-dynamic/testing';
+import * as platformBrowserAnimations from '@angular/platform-browser/animations';
+import * as platformBrowserTesting from '@angular/platform-browser/testing';
+import * as platformServer from '@angular/platform-server';
+import * as platformServerTesting from '@angular/platform-server/testing';
+import * as platformWebworker from '@angular/platform-webworker';
+import * as platformWebworkerDynamic from '@angular/platform-webworker-dynamic';
+import * as router from '@angular/router';
+import * as routerTesting from '@angular/router/testing';
+import * as routerUpgrade from '@angular/router/upgrade';
+import * as serviceWorker from '@angular/service-worker';
+import * as upgrade from '@angular/upgrade';
+import * as upgradeStatic from '@angular/upgrade/static';
+
+export default {
+  animations,
+  animationsBrowser,
+  animationsBrowserTesting,
+  common,
+  commonTesting,
+  commonHttp,
+  commonHttpTesting,
+  compiler,
+  compilerTesting,
+  core,
+  coreTesting,
+  elements,
+  forms,
+  http,
+  httpTesting,
+  platformBrowser,
+  platformBrowserTesting,
+  platformBrowserDynamic,
+  platformBrowserDynamicTesting,
+  platformBrowserAnimations,
+  platformServer,
+  platformServerTesting,
+  platformWebworker,
+  platformWebworkerDynamic,
+  router,
+  routerTesting,
+  routerUpgrade,
+  serviceWorker,
+  upgrade,
+  upgradeStatic
+};

integration/typings_test_ts32/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "angular-integration",
+  "description": "Assert that users with TypeScript 3.2 can type-check an Angular application",
+  "version": "0.0.0",
+  "license": "MIT",
+  "dependencies": {
+    "@angular/animations": "file:../../dist/packages-dist/animations",
+    "@angular/common": "file:../../dist/packages-dist/common",
+    "@angular/compiler": "file:../../dist/packages-dist/compiler",
+    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
+    "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/elements": "file:../../dist/packages-dist/elements",
+    "@angular/forms": "file:../../dist/packages-dist/forms",
+    "@angular/http": "file:../../dist/packages-dist/http",
+    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
+    "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
+    "@angular/platform-webworker": "file:../../dist/packages-dist/platform-webworker",
+    "@angular/platform-webworker-dynamic": "file:../../dist/packages-dist/platform-webworker-dynamic",
+    "@angular/router": "file:../../dist/packages-dist/router",
+    "@angular/service-worker": "file:../../dist/packages-dist/service-worker",
+    "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
+    "@types/jasmine": "2.5.41",
+    "rxjs": "file:../../node_modules/rxjs",
+    "typescript": "3.2.x",
+    "zone.js": "file:../../node_modules/zone.js"
+  },
+  "scripts": {
+    "test": "tsc"
+  }
+}

integration/typings_test_ts32/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "../../dist/typings_test_ts31/",
+    "rootDir": ".",
+    "target": "es5",
+    "lib": [
+      "es5",
+      "dom",
+      "es2015.collection",
+      "es2015.iterable",
+      "es2015.promise"
+    ],
+    "types": [],
+    "strictNullChecks": true
+  },
+  "files": [
+    "include-all.ts",
+    "node_modules/@types/jasmine/index.d.ts"
+  ]
+}

karma-js.conf.js

@@ -29,11 +29,11 @@ module.exports = function(config) {
       {pattern: 'dist/all/@angular/**/*.js', included: false, watched: true},
 
       // Serve AngularJS for `ngUpgrade` testing.
-      {pattern: 'node_modules/angular-1.5/angular.js', included: false, watched: false},
+      {pattern: 'node_modules/angular-1.5/angular?(.min).js', included: false, watched: false},
       {pattern: 'node_modules/angular-mocks-1.5/angular-mocks.js', included: false, watched: false},
-      {pattern: 'node_modules/angular-1.6/angular.js', included: false, watched: false},
+      {pattern: 'node_modules/angular-1.6/angular?(.min).js', included: false, watched: false},
       {pattern: 'node_modules/angular-mocks-1.6/angular-mocks.js', included: false, watched: false},
-      {pattern: 'node_modules/angular/angular.js', included: false, watched: false},
+      {pattern: 'node_modules/angular/angular?(.min).js', included: false, watched: false},
       {pattern: 'node_modules/angular-mocks/angular-mocks.js', included: false, watched: false},
 
       'node_modules/core-js/client/core.js',
@@ -122,12 +122,9 @@ module.exports = function(config) {
       startConnect: false,
       recordVideo: false,
       recordScreenshots: false,
-      options: {
-        'selenium-version': '2.53.0',
-        'command-timeout': 600,
-        'idle-timeout': 600,
-        'max-duration': 5400,
-      }
+      idleTimeout: 600,
+      commandTimeout: 600,
+      maxDuration: 5400,
     },
 
     browserStack: {
@@ -154,10 +151,8 @@ module.exports = function(config) {
       config.sauceLabs.build = buildId;
       config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
 
-      // TODO(mlaval): remove once SauceLabs supports websockets.
-      // This speeds up the capturing a bit, as browsers don't even try to use websocket.
-      console.log('>>>> setting socket.io transport to polling <<<<');
-      config.transports = ['polling'];
+      // Try "websocket" for a faster transmission first. Fallback to "polling" if necessary.
+      config.transports = ['websocket', 'polling'];
     }
 
     if (process.env.CI_MODE.startsWith('browserstack')) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "7.2.0-beta.1",
+  "version": "7.2.0-rc.0",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",
@@ -16,13 +16,11 @@
     "url": "https://github.com/angular/angular.git"
   },
   "scripts": {
-    "preskylint": "bazel build --noshow_progress @io_bazel//src/tools/skylark/java/com/google/devtools/skylark/skylint:Skylint",
-    "//": "deprecated-api is disabled because we use actions.new_file(genfiles_dir) which has no replacement, see https://github.com/bazelbuild/bazel/issues/4858",
-    "skylint": "find . -type f -name \"*.bzl\" ! -path \"*/node_modules/*\" ! -path \"./dist/*\" | xargs $(bazel info bazel-bin)/external/io_bazel/src/tools/skylark/java/com/google/devtools/skylark/skylint/Skylint --disable-checks=deprecated-api",
-    "prebuildifier": "bazel build --noshow_progress @com_github_bazelbuild_buildtools//buildifier",
-    "buildifier": "find . -type f \\( -name \"*.bzl\" -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs $(bazel info bazel-bin)/external/com_github_bazelbuild_buildtools/buildifier/*/buildifier",
+    "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name BUILD -or -name BUILD.bazel -or -name WORKSPACE \\) ! -path \"*/node_modules/*\" | xargs buildifier -v",
+    "bazel:lint": "yarn bazel:format --lint=warn",
+    "bazel:lint-fix": "yarn bazel:format --lint=fix",
     "preinstall": "node tools/yarn/check-yarn.js",
-    "postinstall": "yarn update-webdriver && node ./tools/postinstall-patches.js",
+    "postinstall": "yarn update-webdriver && node --preserve-symlinks --preserve-symlinks-main ./tools/postinstall-patches.js",
     "update-webdriver": "webdriver-manager update --gecko false $CHROMEDRIVER_VERSION_ARG",
     "check-env": "gulp check-env",
     "commitmsg": "node ./scripts/git/commit-msg.js",
@@ -36,8 +34,8 @@
     "@angular-devkit/architect": "^0.10.6",
     "@angular-devkit/core": "^7.0.4",
     "@angular-devkit/schematics": "^7.0.4",
-    "@bazel/karma": "0.21.0",
-    "@bazel/typescript": "0.21.0",
+    "@bazel/karma": "~0.22.0",
+    "@bazel/typescript": "~0.22.0",
     "@schematics/angular": "^7.0.4",
     "@types/chokidar": "1.7.3",
     "@types/convert-source-map": "^1.5.1",
@@ -67,7 +65,7 @@
     "fs-extra": "4.0.2",
     "jasmine": "^3.1.0",
     "jasmine-core": "^3.1.0",
-    "karma": "^2.0.4",
+    "karma": "^3.1.4",
     "magic-string": "^0.25.0",
     "minimist": "1.2.0",
     "mock-fs": "^4.5.0",
@@ -77,10 +75,10 @@
     "selenium-webdriver": "3.5.0",
     "shelljs": "^0.8.1",
     "source-map": "^0.6.1",
-    "source-map-support": "0.4.18",
-    "tsickle": "0.32.1",
-    "tslib": "^1.7.1",
-    "typescript": "~3.1.1",
+    "source-map-support": "0.5.9",
+    "tsickle": "0.34.0",
+    "tslib": "^1.9.0",
+    "typescript": "~3.2.2",
     "xhr2": "0.1.4",
     "yargs": "9.0.1",
     "zone.js": "^0.8.26"
@@ -90,8 +88,9 @@
   },
   "// 2": "devDependencies are not used under Bazel. Many can be removed after test.sh is deleted.",
   "devDependencies": {
-    "@bazel/bazel": "^0.18.1",
-    "@bazel/ibazel": "~0.8.2",
+    "@bazel/bazel": "~0.20.0",
+    "@bazel/buildifier": "^0.19.2",
+    "@bazel/ibazel": "~0.9.0",
     "@types/angular": "^1.6.47",
     "@types/base64-js": "1.2.5",
     "@types/jasminewd2": "^2.0.4",
@@ -124,7 +123,7 @@
     "karma-browserstack-launcher": "^1.3.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-jasmine": "^1.1.2",
-    "karma-sauce-launcher": "^1.2.0",
+    "karma-sauce-launcher": "^2.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "madge": "0.5.0",
     "mutation-observer": "^1.0.3",
@@ -145,4 +144,4 @@
     "vrsource-tslint-rules": "5.1.1",
     "webpack": "1.12.9"
   }
-}
+}

packages/animations/BUILD.bazel

@@ -27,6 +27,11 @@ ng_package(
     tags = [
         "release-with-framework",
     ],
+    # Do not add more to this list.
+    # Dependencies on the full npm_package cause long re-builds.
+    visibility = [
+        "//packages/compiler/test:__pkg__",
+    ],
     deps = [
         ":animations",
         "//packages/animations/browser",

packages/animations/browser/src/render/transition_animation_engine.ts

@@ -811,7 +811,7 @@ export class TransitionAnimationEngine {
     }
 
     this.driver.query(element, DISABLED_SELECTOR, true).forEach(node => {
-      this.markElementAsDisabled(element, false);
+      this.markElementAsDisabled(node, false);
     });
   }
 

packages/animations/browser/src/util.ts

@@ -65,7 +65,7 @@ function parseTimeExpression(
 
     const delayMatch = matches[3];
     if (delayMatch != null) {
-      delay = _convertTimeValueToMS(Math.floor(parseFloat(delayMatch)), matches[4]);
+      delay = _convertTimeValueToMS(parseFloat(delayMatch), matches[4]);
     }
 
     const easingVal = matches[5];

packages/animations/src/animation_metadata.ts

@@ -1132,7 +1132,7 @@ export function useAnimation(
 
 /**
  * Finds one or more inner elements within the current element that is
- * being animated within a sequence. Use with `animateChild()`.
+ * being animated within a sequence. Use with `animate()`.
  *
  * @param selector The element to query, or a set of elements that contain Angular-specific
  * characteristics, specified with one or more of the following tokens.
@@ -1179,7 +1179,7 @@ export function useAnimation(
  * ### Usage Example
  *
  * The following example queries for inner elements and animates them
- * individually using `animateChild()`.
+ * individually using `animate()`. 
  *
  * ```typescript
  * @Component({

packages/bazel/BUILD.bazel

@@ -14,6 +14,9 @@ npm_package(
         "//packages/bazel/docs",
     ],
     tags = ["release-with-framework"],
+    # Do not add more to this list.
+    # Dependencies on the full npm_package cause long re-builds.
+    visibility = ["//visibility:private"],
     deps = [
         "//packages/bazel/src/builders",
         "//packages/bazel/src/ng_package:lib",

packages/bazel/check_version.js

@@ -7,8 +7,8 @@
  */
 /**
  * @fileoverview This script runs as a postinstall in the published npm packages
- * and checks that the version of the build_bazel_rules_typescript external
- * repository matches that of the published npm package.
+ * and checks that the version of the Angular external repository matches that
+ * of the published npm package.
  *
  * Note, this check is only performed with bazel managed deps when the yarn or
  * npm install is from a yarn_install or npm_install repository rule. For self
@@ -19,6 +19,7 @@
 
 const path = require('path');
 const fs = require('fs');
+const semver = require('semver');
 
 // Version in package.bzl should match the npm package version
 // but this should be tolerant of development stamped versions such as
@@ -56,14 +57,12 @@ if (isBazelManagedDeps()) {
   }
   // Be tolerant of versions such as "0.17.0-7-g76dc057"
   const angularPackageVersion = contents.version.split('-')[0];
-  if (npmPackageVersion !== angularPackageVersion) {
-    // TODO: we might need to support a range here.
-    // For example, if you end up with @angular/bazel@6.1.8 and
-    // @angular/bazel@6.1.9 both installed one of the postinstalls is
-    // guaranteed to fail since there's only one version of
-    // angular
-    throw new Error(`Expected angular repository to be version ${
-        npmPackageVersion} but found ${angularPackageVersion}`);
+  // Should match only the major and minor versions
+  const range = `${semver.major(angularPackageVersion)}.${semver.minor(angularPackageVersion)}.x`;
+  if (!semver.satisfies(npmPackageVersion, range)) {
+    throw new Error(
+        `Expected angular npm version ${npmPackageVersion} to satisfy ${range}. ` +
+        `Please update ANGULAR_VERSION in WORKSPACE file to match ${npmPackageVersion}`);
   }
 } else {
   // No version check

packages/bazel/package.bzl

@@ -30,19 +30,19 @@ def rules_angular_dependencies():
     _maybe(
         http_archive,
         name = "build_bazel_rules_typescript",
-        url = "https://github.com/bazelbuild/rules_typescript/archive/0.21.0.zip",
-        strip_prefix = "rules_typescript-0.21.0",
+        url = "https://github.com/bazelbuild/rules_typescript/archive/0.22.0.zip",
+        strip_prefix = "rules_typescript-0.22.0",
     )
 
     # Needed for Remote Execution
     _maybe(
         http_archive,
         name = "bazel_toolchains",
-        sha256 = "c3b08805602cd1d2b67ebe96407c1e8c6ed3d4ce55236ae2efe2f1948f38168d",
-        strip_prefix = "bazel-toolchains-5124557861ebf4c0b67f98180bff1f8551e0b421",
+        sha256 = "07a81ee03f5feae354c9f98c884e8e886914856fb2b6a63cba4619ef10aaaf0b",
+        strip_prefix = "bazel-toolchains-31b5dc8c4e9c7fd3f5f4d04c6714f2ce87b126c1",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/5124557861ebf4c0b67f98180bff1f8551e0b421.tar.gz",
-            "https://github.com/bazelbuild/bazel-toolchains/archive/5124557861ebf4c0b67f98180bff1f8551e0b421.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/31b5dc8c4e9c7fd3f5f4d04c6714f2ce87b126c1.tar.gz",
+            "https://github.com/bazelbuild/bazel-toolchains/archive/31b5dc8c4e9c7fd3f5f4d04c6714f2ce87b126c1.tar.gz",
         ],
     )
 
@@ -74,37 +74,20 @@ def rules_angular_dev_dependencies():
         url = "https://github.com/google/brotli/archive/v1.0.5.zip",
     )
 
-    # Fetching the Bazel source code allows us to compile the Skylark linter
-    http_archive(
-        name = "io_bazel",
-        sha256 = "978f7e0440dd82182563877e2e0b7c013b26b3368888b57837e9a0ae206fd396",
-        strip_prefix = "bazel-0.18.0",
-        url = "https://github.com/bazelbuild/bazel/archive/0.18.0.zip",
-    )
-
-    http_archive(
-        name = "com_github_bazelbuild_buildtools",
-        sha256 = "a82d4b353942b10c1535528b02bff261d020827c9c57e112569eddcb1c93d7f6",
-        strip_prefix = "buildtools-0.17.2",
-        url = "https://github.com/bazelbuild/buildtools/archive/0.17.2.zip",
-    )
-
     #############################################
     # Dependencies for generating documentation #
     #############################################
     http_archive(
         name = "io_bazel_rules_sass",
-        sha256 = "dbe9fb97d5a7833b2a733eebc78c9c1e3880f676ac8af16e58ccf2139cbcad03",
-        strip_prefix = "rules_sass-1.11.0",
-        url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip",
+        strip_prefix = "rules_sass-1.15.1",
+        url = "https://github.com/bazelbuild/rules_sass/archive/1.15.1.zip",
     )
 
     http_archive(
         name = "io_bazel_skydoc",
-        sha256 = "7bfb5545f59792a2745f2523b9eef363f9c3e7274791c030885e7069f8116016",
-        strip_prefix = "skydoc-fe2e9f888d28e567fef62ec9d4a93c425526d701",
+        strip_prefix = "skydoc-a9550cb3ca3939cbabe3b589c57b6f531937fa99",
         # TODO: switch to upstream when https://github.com/bazelbuild/skydoc/pull/103 is merged
-        url = "https://github.com/alexeagle/skydoc/archive/fe2e9f888d28e567fef62ec9d4a93c425526d701.zip",
+        url = "https://github.com/alexeagle/skydoc/archive/a9550cb3ca3939cbabe3b589c57b6f531937fa99.zip",
     )
 
 def _maybe(repo_rule, name, **kwargs):

packages/bazel/package.json

@@ -18,12 +18,13 @@
     "@bazel/typescript": "^0.21.0",
     "@schematics/angular": "^7.0.4",
     "@types/node": "6.0.84",
+    "semver": "^5.6.0",
     "shelljs": "0.8.2",
-    "tsickle": "0.32.1"
+    "tsickle": "0.34.0"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "0.0.0-PLACEHOLDER",
-    "typescript": ">=3.1.1 <3.2"
+    "typescript": ">=3.1.1 <3.3"
   },
   "repository": {
     "type": "git",
@@ -37,4 +38,4 @@
   "scripts": {
     "postinstall": "node ./check_version.js"
   }
-}
+}

packages/bazel/src/builders/BUILD.bazel

@@ -20,6 +20,7 @@ ts_library(
     data = [
         "schema.json",
     ],
+    module_name = "@angular/bazel/src/builders",
     deps = [
         "@ngdeps//@angular-devkit/architect",
         "@ngdeps//@angular-devkit/core",

packages/bazel/src/ng_module.bzl

@@ -201,13 +201,14 @@ def _expected_outs(ctx):
             metadata_files += [ctx.actions.declare_file(basename + ext) for ext in metadata]
 
     # We do this just when producing a flat module index for a publishable ng_module
-    if is_legacy_ngc and _should_produce_flat_module_outs(ctx):
+    if _should_produce_flat_module_outs(ctx):
         flat_module_out = _flat_module_out_file(ctx)
         devmode_js_files.append(ctx.actions.declare_file("%s.js" % flat_module_out))
         closure_js_files.append(ctx.actions.declare_file("%s.closure.js" % flat_module_out))
         bundle_index_typings = ctx.actions.declare_file("%s.d.ts" % flat_module_out)
         declaration_files.append(bundle_index_typings)
-        metadata_files.append(ctx.actions.declare_file("%s.metadata.json" % flat_module_out))
+        if is_legacy_ngc:
+            metadata_files.append(ctx.actions.declare_file("%s.metadata.json" % flat_module_out))
     else:
         bundle_index_typings = None
 
@@ -282,6 +283,8 @@ _collect_summaries_aspect = aspect(
 _EXTRA_NODE_OPTIONS_FLAGS = [
     # Expose the v8 garbage collection API to JS.
     "--node_options=--expose-gc",
+    # Show ~full stack traces, instead of cutting off after 10 items.
+    "--node_options=--stack-trace-limit=100",
 ]
 
 def ngc_compile_action(

packages/bazel/src/ng_package/ng_package.bzl

@@ -153,13 +153,14 @@ def _flatten_paths(directory):
             result.append(f.map.path)
     return result
 
-# takes an depset of files and returns an array that doesn't contain any generated files by ngc
-def _filter_out_generated_files(files, extension, filter_external_files):
+# Takes a depset of files and returns a depset that doesn't contain any generated files by NGC.
+# Optionally can filter out files that do not belong to a specified package path.
+def _filter_out_generated_files(files, extension, package_path = None):
     result = []
     for file in files:
-        # If the "filter_external_files" parameter has been set to true, filter out files
-        # that refer to external workspaces.
-        if filter_external_files and file.short_path.startswith("../"):
+        # If the "package_path" parameter has been specified, filter out files
+        # that do not start with the the specified package path.
+        if package_path and not file.short_path.startswith(package_path):
             continue
 
         # Filter out files that are generated by the Angular Compiler CLI.
@@ -184,9 +185,17 @@ def _filter_js_inputs(all_inputs):
 def _ng_package_impl(ctx):
     npm_package_directory = ctx.actions.declare_directory("%s.ng_pkg" % ctx.label.name)
 
-    esm_2015_files = _filter_out_generated_files(collect_es6_sources(ctx), "js", False)
-    esm5_sources = _filter_out_generated_files(flatten_esm5(ctx), "js", False)
-    type_definitions = _filter_out_generated_files(collect_type_definitions(ctx), "d.ts", True)
+    esm_2015_files = _filter_out_generated_files(collect_es6_sources(ctx), "js")
+    esm5_sources = _filter_out_generated_files(flatten_esm5(ctx), "js")
+
+    # Filter out all TypeScript definitions generated by NGC as well as definition files
+    # that do not belong to the current package. We only want to package types that belong
+    # to the current package.
+    type_definitions = _filter_out_generated_files(
+        collect_type_definitions(ctx),
+        "d.ts",
+        ctx.label.package,
+    )
 
     # These accumulators match the directory names where the files live in the
     # Angular package format.

packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template

@@ -10,6 +10,8 @@
 # imports also make sense when referencing the published package.
 workspace(name = "<%= utils.underscore(name) %>")
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 # The @angular repo contains rule for building Angular applications
 # Provides "build_bazel_rules_typescript"
 ANGULAR_VERSION = "<%= ANGULAR_VERSION %>"
@@ -45,6 +47,9 @@ load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependenci
 rules_typescript_dependencies()
 # build_bazel_rules_nodejs is loaded transitively through rules_typescript_dependencies.
 
+load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
+rules_nodejs_dependencies()
+
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 # 0.18.0 is needed for .bazelignore
 check_bazel_version("0.18.0")

packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template

@@ -12,7 +12,10 @@ ts_library(
       "@npm//@types/node",
       "@npm//jasmine",
       "@npm//protractor",
-    ]
+    ],
+    data = [
+      "//:tsconfig.json",
+    ],
 )
 
 protractor_web_test_suite(

packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template

@@ -58,7 +58,7 @@ ts_devserver(
         "npm/node_modules/zone.js/dist",
         "npm/node_modules/tslib",
     ],
-    entry_module = "<%= name %>/src/main.dev",
+    entry_module = "<%= utils.underscore(name) %>/src/main.dev",
     serving_path = "/bundle.min.js",
     static_files = [
         "@npm//node_modules/zone.js:dist/zone.min.js",
@@ -88,6 +88,7 @@ ts_library(
     deps = [
         "@angular//packages/core/testing",
         "@angular//packages/platform-browser-dynamic/testing",
+        "@npm//@types",
     ],
 )
 

packages/bazel/src/schematics/bazel-workspace/index.ts

@@ -11,25 +11,27 @@
 import {strings} from '@angular-devkit/core';
 import {Rule, SchematicContext, SchematicsException, Tree, apply, applyTemplates, mergeWith, move, url} from '@angular-devkit/schematics';
 import {getWorkspace} from '@schematics/angular/utility/config';
+import {latestVersions} from '@schematics/angular/utility/latest-versions';
 import {validateProjectName} from '@schematics/angular/utility/validation';
 
 import {Schema as BazelWorkspaceOptions} from './schema';
 
+
 /**
- * Look for package.json file for @angular/core in node_modules and extract its
- * version.
+ * Look for package.json file for package with `packageName` in node_modules and
+ * extract its version.
  */
-function findAngularVersion(options: BazelWorkspaceOptions, host: Tree): string|null {
+function findVersion(projectName: string, packageName: string, host: Tree): string|null {
   // Need to look in multiple locations because we could be working in a subtree.
   const candidates = [
-    'node_modules/@angular/core/package.json',
-    `${options.name}/node_modules/@angular/core/package.json`,
+    `node_modules/${packageName}/package.json`,
+    `${projectName}/node_modules/${packageName}/package.json`,
   ];
   for (const candidate of candidates) {
     if (host.exists(candidate)) {
       try {
         const packageJson = JSON.parse(host.read(candidate).toString());
-        if (packageJson.name === '@angular/core' && packageJson.version) {
+        if (packageJson.name === packageName && packageJson.version) {
           return packageJson.version;
         }
       } catch {
@@ -39,6 +41,15 @@ function findAngularVersion(options: BazelWorkspaceOptions, host: Tree): string|
   return null;
 }
 
+/**
+ * Clean the version string and return version in the form "1.2.3". Return
+ * null if version string is invalid. This is similar to semver.clean() but
+ * takes characters like '^' and '~' into account.
+ */
+export function clean(version: string): string|null {
+  const matches = version.match(/(\d+\.\d+\.\d+)/);
+  return matches && matches.pop() || null;
+}
 
 export default function(options: BazelWorkspaceOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
@@ -54,13 +65,25 @@ export default function(options: BazelWorkspaceOptions): Rule {
     }
     const appDir = `${newProjectRoot}/${options.name}`;
 
-    // If user already has angular installed, Bazel should use that version
-    const existingAngularVersion = findAngularVersion(options, host);
+    // If the project already has some deps installed, Bazel should use existing
+    // versions.
+    const existingVersions = {
+      Angular: findVersion(options.name, '@angular/core', host),
+      RxJs: findVersion(options.name, 'rxjs', host),
+    };
+
+    Object.keys(existingVersions).forEach((name: 'Angular' | 'RxJs') => {
+      const version = existingVersions[name] as string;
+      if (version) {
+        context.logger.info(`Bazel will reuse existing version for ${name}: ${version}`);
+      }
+    });
 
     const workspaceVersions = {
-      'ANGULAR_VERSION': existingAngularVersion || '7.1.1',
-      'RULES_SASS_VERSION': '1.14.1',
-      'RXJS_VERSION': '6.3.3',
+      'ANGULAR_VERSION': existingVersions.Angular || clean(latestVersions.Angular),
+      'RXJS_VERSION': existingVersions.RxJs || clean(latestVersions.RxJs),
+      // TODO(kyliau): Consider moving this to latest-versions.ts
+      'RULES_SASS_VERSION': '1.15.1',
     };
 
     return mergeWith(apply(url('./files'), [

packages/bazel/src/schematics/bazel-workspace/index_spec.ts

@@ -8,6 +8,7 @@
 
 import {HostTree} from '@angular-devkit/schematics';
 import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
+import {clean} from './index';
 
 describe('Bazel-workspace Schematic', () => {
   const schematicRunner =
@@ -41,6 +42,15 @@ describe('Bazel-workspace Schematic', () => {
     expect(workspace).toMatch('ANGULAR_VERSION = "6.6.6"');
   });
 
+  it('should have the correct entry_module for devserver', () => {
+    const options = {...defaultOptions, name: 'demo-app'};
+    const host = schematicRunner.runSchematic('bazel-workspace', options);
+    const {files} = host;
+    expect(files).toContain('/demo-app/src/BUILD.bazel');
+    const content = host.readContent('/demo-app/src/BUILD.bazel');
+    expect(content).toContain('entry_module = "demo_app/src/main.dev"');
+  });
+
   describe('WORKSPACE', () => {
     it('should contain project name', () => {
       const options = {...defaultOptions};
@@ -59,3 +69,14 @@ describe('Bazel-workspace Schematic', () => {
     });
   });
 });
+
+describe('clean', () => {
+  [['1.2.3', '1.2.3'], ['  1.2.3', '1.2.3'], ['1.2.3  ', '1.2.3'], ['~1.2.3', '1.2.3'],
+   ['^1.2.3', '1.2.3'], ['v1.2.3', '1.2.3'], ['1.2', null], ['a.b.c', null],
+  ].forEach(([version, want]: [string, string]) => {
+    it(`should match ${version} with ${want}`, () => {
+      const got = clean(version);
+      expect(got).toBe(want);
+    });
+  });
+});

packages/bazel/src/schematics/ng-new/index.ts

@@ -8,7 +8,7 @@
  * @fileoverview Schematics for ng-new project that builds with Bazel.
  */
 
-import {apply, applyTemplates, chain, externalSchematic, MergeStrategy, mergeWith, move, Rule, schematic, Tree, url, SchematicsException, UpdateRecorder,} from '@angular-devkit/schematics';
+import {SchematicContext, apply, applyTemplates, chain, externalSchematic, MergeStrategy, mergeWith, move, Rule, schematic, Tree, url, SchematicsException, UpdateRecorder,} from '@angular-devkit/schematics';
 import {parseJsonAst, JsonAstObject, strings, JsonValue} from '@angular-devkit/core';
 import {findPropertyInAstObject, insertPropertyInAstObjectInOrder} from '@schematics/angular/utility/json-utils';
 import {validateProjectName} from '@schematics/angular/utility/validation';
@@ -35,8 +35,9 @@ function addDevDependenciesToPackageJson(options: Schema) {
 
     const devDependencies: {[k: string]: string} = {
       '@angular/bazel': angularCoreVersion,
-      '@bazel/karma': '0.21.0',
-      '@bazel/typescript': '0.21.0',
+      // TODO(kyliau): Consider moving this to latest-versions.ts
+      '@bazel/karma': '^0.22.0',
+      '@bazel/typescript': '^0.22.0',
     };
 
     const recorder = host.beginUpdate(packageJson);

packages/bazel/src/schematics/ng-new/index_spec.ts

@@ -41,6 +41,16 @@ describe('Ng-new Schematic', () => {
     expect(json.dependencies[core]).toBe(json.devDependencies[bazel]);
   });
 
+  it('should add @bazel/* dev dependencies', () => {
+    const options = {...defaultOptions};
+    const host = schematicRunner.runSchematic('ng-new', options);
+    const content = host.readContent('/demo/package.json');
+    const json = JSON.parse(content);
+    const devDeps = Object.keys(json.devDependencies);
+    expect(devDeps).toContain('@bazel/karma');
+    expect(devDeps).toContain('@bazel/typescript');
+  });
+
   it('should create Bazel workspace file', () => {
     const options = {...defaultOptions};
     const host = schematicRunner.runSchematic('ng-new', options);

packages/bazel/test/ng_package/core_package.spec.ts

@@ -73,10 +73,8 @@ describe('@angular/core ng_package', () => {
 
 
     describe('typescript support', () => {
-
-      fixmeIvy('FW-738: ngtsc doesn\'t generate flat index files')
-          .it('should have an index d.ts file',
-              () => { expect(shx.cat('core.d.ts')).toContain(`export *`); });
+      it('should have an index d.ts file',
+         () => { expect(shx.cat('core.d.ts')).toContain(`export *`); });
 
       it('should not have amd module names',
          () => { expect(shx.cat('public_api.d.ts')).not.toContain('<amd-module name'); });

packages/bazel/test/ngc-wrapped/index_test.ts

@@ -6,17 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {fixmeIvy} from '@angular/private/testing';
-import * as fs from 'fs';
 import * as path from 'path';
 
 import {setup} from './test_support';
 
 describe('ngc_wrapped', () => {
 
-  // fixmeIvy placeholder to prevent jasmine from erroring out because there are no specs
-  it('should be removed once the fixmeIvy below is resolved', () => {});
-
   it('should work', () => {
     const {read, write, runOneBuild, writeConfig, shouldExist, basePath} = setup();
 

packages/benchpress/test/BUILD.bazel

@@ -4,6 +4,13 @@ ts_library(
     name = "test_lib",
     testonly = True,
     srcs = glob(["**/*.ts"]),
+    deps = [
+        "//packages:types",
+        "//packages/benchpress",
+        "//packages/core",
+        "//packages/core/testing",
+        "@ngdeps//protractor",
+    ],
 )
 
 jasmine_node_test(

packages/common/BUILD.bazel

@@ -30,6 +30,17 @@ ng_package(
     tags = [
         "release-with-framework",
     ],
+    # Do not add more to this list.
+    # Dependencies on the full npm_package cause long re-builds.
+    visibility = [
+        "//packages/bazel/test/ng_package:__pkg__",
+        "//packages/compiler-cli/test:__pkg__",
+        "//packages/compiler-cli/test/diagnostics:__pkg__",
+        "//packages/compiler-cli/test/ngcc:__pkg__",
+        "//packages/compiler-cli/test/transformers:__pkg__",
+        "//packages/compiler/test:__pkg__",
+        "//packages/language-service/test:__pkg__",
+    ],
     deps = [
         "//packages/common",
         "//packages/common/http",

packages/common/src/i18n/locale_data_api.ts

@@ -380,7 +380,7 @@ export function getLocaleCurrencySymbol(locale: string): string|null {
 }
 
 /**
- * The name of the currency for the main country using this locale (e.g. USD for the locale
+ * The name of the currency for the main country using this locale (e.g. 'US Dollar' for the locale
  * en-US).
  * The name will be `null` if the main country cannot be determined.
  *

packages/common/src/pipes/keyvalue_pipe.ts

@@ -36,7 +36,7 @@ export interface KeyValue<K, V> {
  * @usageNotes
  * ### Examples
  *
- * This examples show how an Object or a Map and be iterated by ngFor with the use of this keyvalue
+ * This examples show how an Object or a Map can be iterated by ngFor with the use of this keyvalue
  * pipe.
  *
  * {@example common/pipes/ts/keyvalue_pipe.ts region='KeyValuePipe'}
@@ -47,10 +47,8 @@ export interface KeyValue<K, V> {
 export class KeyValuePipe implements PipeTransform {
   constructor(private readonly differs: KeyValueDiffers) {}
 
-  // TODO(issue/24571): remove '!'.
   private differ !: KeyValueDiffer<any, any>;
-  // TODO(issue/24571): remove '!'.
-  private keyValues !: Array<KeyValue<any, any>>;
+  private keyValues: Array<KeyValue<any, any>> = [];
 
   transform<K, V>(input: null, compareFn?: (a: KeyValue<K, V>, b: KeyValue<K, V>) => number): null;
   transform<V>(

packages/common/src/pipes/number_pipe.ts

@@ -179,9 +179,9 @@ export class CurrencyPipe implements PipeTransform {
    *   - `minIntegerDigits`: The minimum number of integer digits before the decimal point.
    * Default is `1`.
    *   - `minFractionDigits`: The minimum number of digits after the decimal point.
-   * Default is `0`.
+   * Default is `2`.
    *   - `maxFractionDigits`: The maximum number of digits after the decimal point.
-   * Default is `3`.
+   * Default is `2`.
    * If not provided, the number will be formatted with the proper amount of digits,
    * depending on what the [ISO 4217](https://en.wikipedia.org/wiki/ISO_4217) specifies.
    * For example, the Canadian dollar has 2 digits, whereas the Chilean peso has none.

packages/common/test/directives/ng_component_outlet_spec.ts

@@ -11,7 +11,7 @@ import {NgComponentOutlet} from '@angular/common/src/directives/ng_component_out
 import {Compiler, Component, ComponentRef, Inject, InjectionToken, Injector, NO_ERRORS_SCHEMA, NgModule, NgModuleFactory, Optional, QueryList, TemplateRef, Type, ViewChild, ViewChildren, ViewContainerRef} from '@angular/core';
 import {TestBed, async} from '@angular/core/testing';
 import {expect} from '@angular/platform-browser/testing/src/matchers';
-import {fixmeIvy} from '@angular/private/testing';
+import {modifiedInIvy} from '@angular/private/testing';
 
 describe('insert/remove', () => {
 
@@ -107,17 +107,20 @@ describe('insert/remove', () => {
 
      }));
 
-  it('should resolve a with injector', async(() => {
-       let fixture = TestBed.createComponent(TestComponent);
 
-       fixture.componentInstance.cmpRef = null;
-       fixture.componentInstance.currentComponent = InjectedComponent;
-       fixture.detectChanges();
-       let cmpRef: ComponentRef<InjectedComponent> = fixture.componentInstance.cmpRef !;
-       expect(cmpRef).toBeAnInstanceOf(ComponentRef);
-       expect(cmpRef.instance).toBeAnInstanceOf(InjectedComponent);
-       expect(cmpRef.instance.testToken).toBeNull();
-     }));
+  modifiedInIvy('Static ViewChild and ContentChild queries are resolved in update mode')
+      .it('should resolve with an injector', async(() => {
+            let fixture = TestBed.createComponent(TestComponent);
+
+            // We are accessing a ViewChild (ngComponentOutlet) before change detection has run
+            fixture.componentInstance.cmpRef = null;
+            fixture.componentInstance.currentComponent = InjectedComponent;
+            fixture.detectChanges();
+            let cmpRef: ComponentRef<InjectedComponent> = fixture.componentInstance.cmpRef !;
+            expect(cmpRef).toBeAnInstanceOf(ComponentRef);
+            expect(cmpRef.instance).toBeAnInstanceOf(InjectedComponent);
+            expect(cmpRef.instance.testToken).toBeNull();
+          }));
 
   it('should render projectable nodes, if supplied', async(() => {
        const template = `<ng-template>projected foo</ng-template>${TEST_CMP_TEMPLATE}`;
@@ -157,22 +160,21 @@ describe('insert/remove', () => {
        expect(fixture.nativeElement).toHaveText('baz');
      }));
 
-  fixmeIvy('FW-739: destroy on NgModuleRef is not being called')
-      .it('should clean up moduleRef, if supplied', async(() => {
-            let destroyed = false;
-            const compiler = TestBed.get(Compiler) as Compiler;
-            const fixture = TestBed.createComponent(TestComponent);
-            fixture.componentInstance.module = compiler.compileModuleSync(TestModule2);
-            fixture.componentInstance.currentComponent = Module2InjectedComponent;
-            fixture.detectChanges();
+  it('should clean up moduleRef, if supplied', async(() => {
+       let destroyed = false;
+       const compiler = TestBed.get(Compiler) as Compiler;
+       const fixture = TestBed.createComponent(TestComponent);
+       fixture.componentInstance.module = compiler.compileModuleSync(TestModule2);
+       fixture.componentInstance.currentComponent = Module2InjectedComponent;
+       fixture.detectChanges();
 
-            const moduleRef = fixture.componentInstance.ngComponentOutlet['_moduleRef'] !;
-            spyOn(moduleRef, 'destroy').and.callThrough();
+       const moduleRef = fixture.componentInstance.ngComponentOutlet['_moduleRef'] !;
+       spyOn(moduleRef, 'destroy').and.callThrough();
 
-            expect(moduleRef.destroy).not.toHaveBeenCalled();
-            fixture.destroy();
-            expect(moduleRef.destroy).toHaveBeenCalled();
-          }));
+       expect(moduleRef.destroy).not.toHaveBeenCalled();
+       fixture.destroy();
+       expect(moduleRef.destroy).toHaveBeenCalled();
+     }));
 
   it('should not re-create moduleRef when it didn\'t actually change', async(() => {
        const compiler = TestBed.get(Compiler) as Compiler;

packages/common/test/pipes/keyvalue_pipe_spec.ts

@@ -25,6 +25,10 @@ describe('KeyValuePipe', () => {
     expect(pipe.transform(fn as any)).toEqual(null);
   });
   describe('object dictionary', () => {
+    it('should return empty array of an empty dictionary', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      expect(pipe.transform({})).toEqual([]);
+    });
     it('should transform a basic dictionary', () => {
       const pipe = new KeyValuePipe(defaultKeyValueDiffers);
       expect(pipe.transform({1: 2})).toEqual([{key: '1', value: 2}]);
@@ -62,6 +66,10 @@ describe('KeyValuePipe', () => {
   });
 
   describe('Map', () => {
+    it('should return an empty array for an empty Map', () => {
+      const pipe = new KeyValuePipe(defaultKeyValueDiffers);
+      expect(pipe.transform(new Map())).toEqual([]);
+    });
     it('should transform a basic Map', () => {
       const pipe = new KeyValuePipe(defaultKeyValueDiffers);
       expect(pipe.transform(new Map([[1, 2]]))).toEqual([{key: 1, value: 2}]);

packages/compiler-cli/BUILD.bazel

@@ -46,6 +46,9 @@ npm_package(
     tags = [
         "release-with-framework",
     ],
+    # Do not add more to this list.
+    # Dependencies on the full npm_package cause long re-builds.
+    visibility = ["//visibility:private"],
     deps = [
         ":compiler-cli",
         "//packages/compiler-cli/src/ngcc",

packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel

@@ -11,9 +11,6 @@ ng_module(
         ],
     ),
     module_name = "app_built",
-    tags = [
-        "fixme-ivy-aot",
-    ],
     deps = [
         "//packages/compiler-cli/integrationtest/bazel/injectable_def/lib2",
         "//packages/core",

packages/compiler-cli/integrationtest/bazel/injectable_def/app/src/index.ts

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export {RootAppModule} from './root';

packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel

@@ -10,23 +10,18 @@ ts_library(
             "**/*.ts",
         ],
     ),
-    tags = [
-        "fixme-ivy-aot",
-    ],
     deps = [
         "//packages/compiler-cli/integrationtest/bazel/injectable_def/app",
         "//packages/core",
         "//packages/core/testing",
         "//packages/platform-server",
+        "//packages/private/testing",
     ],
 )
 
 jasmine_node_test(
     name = "test",
     bootstrap = ["angular/tools/testing/init_node_spec.js"],
-    tags = [
-        "fixme-ivy-aot",
-    ],
     deps = [
         ":test_lib",
         "//packages/platform-server",

packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/app_spec.ts

@@ -168,7 +168,7 @@ describe('ngInjectableDef Bazel Integration', () => {
     expect(TestBed.get(INJECTOR).get('foo')).toEqual('bar');
   });
 
-  fixmeIvy('FW-646: Directive providers don\'t support primitive types')
+  fixmeIvy('FW-854: NodeInjector does not know how to get itself (INJECTOR)')
       .it('Component injector understands requests for INJECTABLE', () => {
         @Component({
           selector: 'test-cmp',

packages/compiler-cli/package.json

@@ -24,10 +24,10 @@
   },
   "peerDependencies": {
     "@angular/compiler": "0.0.0-PLACEHOLDER",
-    "typescript": ">=3.1.1 <3.2"
+    "typescript": ">=3.1.1 <3.3"
   },
-  "engines" : {
-    "node" : ">=8.0"
+  "engines": {
+    "node": ">=8.0"
   },
   "repository": {
     "type": "git",
@@ -49,4 +49,4 @@
   "ng-update": {
     "packageGroup": "NG_UPDATE_PACKAGE_GROUP"
   }
-}
+}

packages/compiler-cli/src/diagnostics/typescript_symbols.ts

@@ -718,13 +718,20 @@ function getBuiltinTypeFromTs(kind: BuiltinType, context: TypeContext): ts.Type
           checker.getTypeAtLocation(setParents(<ts.Node>{kind: ts.SyntaxKind.NullKeyword}, node));
       break;
     case BuiltinType.Number:
-      const numeric = <ts.Node>{kind: ts.SyntaxKind.NumericLiteral};
+      const numeric = <ts.LiteralLikeNode>{
+        kind: ts.SyntaxKind.NumericLiteral,
+        text: node.getText(),
+      };
       setParents(<any>{kind: ts.SyntaxKind.ExpressionStatement, expression: numeric}, node);
       type = checker.getTypeAtLocation(numeric);
       break;
     case BuiltinType.String:
-      type = checker.getTypeAtLocation(
-          setParents(<ts.Node>{kind: ts.SyntaxKind.NoSubstitutionTemplateLiteral}, node));
+      type = checker.getTypeAtLocation(setParents(
+          <ts.LiteralLikeNode>{
+            kind: ts.SyntaxKind.NoSubstitutionTemplateLiteral,
+            text: node.getText(),
+          },
+          node));
       break;
     case BuiltinType.Undefined:
       type = checker.getTypeAtLocation(setParents(

packages/compiler-cli/src/ngcc/src/analysis/module_with_providers_analyzer.ts

@@ -0,0 +1,118 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as ts from 'typescript';
+
+import {ReferencesRegistry} from '../../../ngtsc/annotations';
+import {Declaration} from '../../../ngtsc/host';
+import {ResolvedReference} from '../../../ngtsc/metadata';
+import {NgccReflectionHost} from '../host/ngcc_host';
+import {isDefined} from '../utils';
+
+export interface ModuleWithProvidersInfo {
+  /**
+   * The declaration (in the .d.ts file) of the function that returns
+   * a `ModuleWithProviders object, but has a signature that needs
+   * a type parameter adding.
+   */
+  declaration: ts.MethodDeclaration|ts.FunctionDeclaration;
+  /**
+   * The NgModule class declaration (in the .d.ts file) to add as a type parameter.
+   */
+  ngModule: Declaration;
+}
+
+export type ModuleWithProvidersAnalyses = Map<ts.SourceFile, ModuleWithProvidersInfo[]>;
+export const ModuleWithProvidersAnalyses = Map;
+
+export class ModuleWithProvidersAnalyzer {
+  constructor(private host: NgccReflectionHost, private referencesRegistry: ReferencesRegistry) {}
+
+  analyzeProgram(program: ts.Program): ModuleWithProvidersAnalyses {
+    const analyses = new ModuleWithProvidersAnalyses();
+    const rootFiles = this.getRootFiles(program);
+    rootFiles.forEach(f => {
+      const fns = this.host.getModuleWithProvidersFunctions(f);
+      fns && fns.forEach(fn => {
+        const dtsFn = this.getDtsDeclaration(fn.declaration);
+        const typeParam = dtsFn.type && ts.isTypeReferenceNode(dtsFn.type) &&
+                dtsFn.type.typeArguments && dtsFn.type.typeArguments[0] ||
+            null;
+        if (!typeParam || isAnyKeyword(typeParam)) {
+          // Either we do not have a parameterized type or the type is `any`.
+          let ngModule = this.host.getDeclarationOfIdentifier(fn.ngModule);
+          if (!ngModule) {
+            throw new Error(
+                `Cannot find a declaration for NgModule ${fn.ngModule.text} referenced in ${fn.declaration.getText()}`);
+          }
+          // For internal (non-library) module references, redirect the module's value declaration
+          // to its type declaration.
+          if (ngModule.viaModule === null) {
+            const dtsNgModule = this.host.getDtsDeclaration(ngModule.node);
+            if (!dtsNgModule) {
+              throw new Error(
+                  `No typings declaration can be found for the referenced NgModule class in ${fn.declaration.getText()}.`);
+            }
+            if (!ts.isClassDeclaration(dtsNgModule)) {
+              throw new Error(
+                  `The referenced NgModule in ${fn.declaration.getText()} is not a class declaration in the typings program; instead we get ${dtsNgModule.getText()}`);
+            }
+            // Record the usage of the internal module as it needs to become an exported symbol
+            this.referencesRegistry.add(new ResolvedReference(ngModule.node, fn.ngModule));
+
+            ngModule = {node: dtsNgModule, viaModule: null};
+          }
+          const dtsFile = dtsFn.getSourceFile();
+          const analysis = analyses.get(dtsFile) || [];
+          analysis.push({declaration: dtsFn, ngModule});
+          analyses.set(dtsFile, analysis);
+        }
+      });
+    });
+    return analyses;
+  }
+
+  private getRootFiles(program: ts.Program): ts.SourceFile[] {
+    return program.getRootFileNames().map(f => program.getSourceFile(f)).filter(isDefined);
+  }
+
+  private getDtsDeclaration(fn: ts.SignatureDeclaration) {
+    let dtsFn: ts.Declaration|null = null;
+    const containerClass = this.host.getClassSymbol(fn.parent);
+    const fnName = fn.name && ts.isIdentifier(fn.name) && fn.name.text;
+    if (containerClass && fnName) {
+      const dtsClass = this.host.getDtsDeclaration(containerClass.valueDeclaration);
+      // Get the declaration of the matching static method
+      dtsFn = dtsClass && ts.isClassDeclaration(dtsClass) ?
+          dtsClass.members
+              .find(
+                  member => ts.isMethodDeclaration(member) && ts.isIdentifier(member.name) &&
+                      member.name.text === fnName) as ts.Declaration :
+          null;
+    } else {
+      dtsFn = this.host.getDtsDeclaration(fn);
+    }
+    if (!dtsFn) {
+      throw new Error(`Matching type declaration for ${fn.getText()} is missing`);
+    }
+    if (!isFunctionOrMethod(dtsFn)) {
+      throw new Error(
+          `Matching type declaration for ${fn.getText()} is not a function: ${dtsFn.getText()}`);
+    }
+    return dtsFn;
+  }
+}
+
+
+function isFunctionOrMethod(declaration: ts.Declaration): declaration is ts.FunctionDeclaration|
+    ts.MethodDeclaration {
+  return ts.isFunctionDeclaration(declaration) || ts.isMethodDeclaration(declaration);
+}
+
+function isAnyKeyword(typeParam: ts.TypeNode): typeParam is ts.KeywordTypeNode {
+  return typeParam.kind === ts.SyntaxKind.AnyKeyword;
+}

packages/compiler-cli/src/ngcc/src/analysis/private_declarations_analyzer.ts

@@ -15,7 +15,7 @@ import {hasNameIdentifier, isDefined} from '../utils';
 export interface ExportInfo {
   identifier: string;
   from: string;
-  dtsFrom: string|null;
+  dtsFrom?: string|null;
 }
 export type PrivateDeclarationsAnalyses = ExportInfo[];
 
@@ -52,7 +52,7 @@ export class PrivateDeclarationsAnalyzer {
     return Array.from(privateDeclarations.keys()).map(id => {
       const from = id.getSourceFile().fileName;
       const declaration = privateDeclarations.get(id) !;
-      const dtsDeclaration = this.host.getDtsDeclarationOfClass(declaration.node);
+      const dtsDeclaration = this.host.getDtsDeclaration(declaration.node);
       const dtsFrom = dtsDeclaration && dtsDeclaration.getSourceFile().fileName;
       return {identifier: id.text, from, dtsFrom};
     });

packages/compiler-cli/src/ngcc/src/host/esm2015_host.ts

@@ -14,7 +14,7 @@ import {BundleProgram} from '../packages/bundle_program';
 import {findAll, getNameText, isDefined} from '../utils';
 
 import {DecoratedClass} from './decorated_class';
-import {NgccReflectionHost, PRE_R3_MARKER, SwitchableVariableDeclaration, isSwitchableVariableDeclaration} from './ngcc_host';
+import {ModuleWithProvidersFunction, NgccReflectionHost, PRE_R3_MARKER, SwitchableVariableDeclaration, isSwitchableVariableDeclaration} from './ngcc_host';
 
 export const DECORATORS = 'decorators' as ts.__String;
 export const PROP_DECORATORS = 'propDecorators' as ts.__String;
@@ -49,10 +49,10 @@ export const CONSTRUCTOR_PARAMS = 'ctorParameters' as ts.__String;
  *   a static method called `ctorParameters`.
  */
 export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements NgccReflectionHost {
-  protected dtsClassMap: Map<string, ts.ClassDeclaration>|null;
+  protected dtsDeclarationMap: Map<string, ts.Declaration>|null;
   constructor(protected isCore: boolean, checker: ts.TypeChecker, dts?: BundleProgram|null) {
     super(checker);
-    this.dtsClassMap = dts && this.computeDtsClassMap(dts.path, dts.program) || null;
+    this.dtsDeclarationMap = dts && this.computeDtsDeclarationMap(dts.path, dts.program) || null;
   }
 
   /**
@@ -327,15 +327,15 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * is not a class or has an unknown number of type parameters.
    */
   getGenericArityOfClass(clazz: ts.Declaration): number|null {
-    const dtsClass = this.getDtsDeclarationOfClass(clazz);
-    if (dtsClass) {
-      return dtsClass.typeParameters ? dtsClass.typeParameters.length : 0;
+    const dtsDeclaration = this.getDtsDeclaration(clazz);
+    if (dtsDeclaration && ts.isClassDeclaration(dtsDeclaration)) {
+      return dtsDeclaration.typeParameters ? dtsDeclaration.typeParameters.length : 0;
     }
     return null;
   }
 
   /**
-   * Take an exported declaration of a class (maybe downleveled to a variable) and look up the
+   * Take an exported declaration of a class (maybe down-leveled to a variable) and look up the
    * declaration of its type in a separate .d.ts tree.
    *
    * This function is allowed to return `null` if the current compilation unit does not have a
@@ -346,19 +346,47 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * Note that the `ts.ClassDeclaration` returned from this function may not be from the same
    * `ts.Program` as the input declaration.
    */
-  getDtsDeclarationOfClass(declaration: ts.Declaration): ts.ClassDeclaration|null {
-    if (this.dtsClassMap) {
-      if (ts.isClassDeclaration(declaration)) {
-        if (!declaration.name || !ts.isIdentifier(declaration.name)) {
-          throw new Error(
-              `Cannot get the dts file for a class declaration that has no indetifier: ${declaration.getText()} in ${declaration.getSourceFile().fileName}`);
-        }
-        return this.dtsClassMap.get(declaration.name.text) || null;
-      }
+  getDtsDeclaration(declaration: ts.Declaration): ts.Declaration|null {
+    if (!this.dtsDeclarationMap) {
+      return null;
     }
-    return null;
+    if (!isNamedDeclaration(declaration)) {
+      throw new Error(
+          `Cannot get the dts file for a declaration that has no name: ${declaration.getText()} in ${declaration.getSourceFile().fileName}`);
+    }
+    return this.dtsDeclarationMap.get(declaration.name.text) || null;
   }
 
+  /**
+   * Search the given source file for exported functions and static class methods that return
+   * ModuleWithProviders objects.
+   * @param f The source file to search for these functions
+   * @returns An array of function declarations that look like they return ModuleWithProviders
+   * objects.
+   */
+  getModuleWithProvidersFunctions(f: ts.SourceFile): ModuleWithProvidersFunction[] {
+    const exports = this.getExportsOfModule(f);
+    if (!exports) return [];
+    const infos: ModuleWithProvidersFunction[] = [];
+    exports.forEach((declaration, name) => {
+      if (this.isClass(declaration.node)) {
+        this.getMembersOfClass(declaration.node).forEach(member => {
+          if (member.isStatic) {
+            const info = this.parseForModuleWithProviders(member.node);
+            if (info) {
+              infos.push(info);
+            }
+          }
+        });
+      } else {
+        const info = this.parseForModuleWithProviders(declaration.node);
+        if (info) {
+          infos.push(info);
+        }
+      }
+    });
+    return infos;
+  }
 
   ///////////// Protected Helpers /////////////
 
@@ -738,7 +766,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     }
 
     if (!name) {
-      if (isNamedDeclaration(node) && node.name && ts.isIdentifier(node.name)) {
+      if (isNamedDeclaration(node)) {
         name = node.name.text;
         nameNode = node.name;
       } else {
@@ -797,10 +825,11 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
         this.getParamInfoFromHelperCall(classSymbol, parameterNodes);
 
     return parameterNodes.map((node, index) => {
-      const {decorators, type} =
-          paramInfo && paramInfo[index] ? paramInfo[index] : {decorators: null, type: null};
+      const {decorators, typeExpression} = paramInfo && paramInfo[index] ?
+          paramInfo[index] :
+          {decorators: null, typeExpression: null};
       const nameNode = node.name;
-      return {name: getNameText(nameNode), nameNode, type, decorators};
+      return {name: getNameText(nameNode), nameNode, typeExpression, typeNode: null, decorators};
     });
   }
 
@@ -832,12 +861,12 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
                 element =>
                     ts.isObjectLiteralExpression(element) ? reflectObjectLiteral(element) : null)
             .map(paramInfo => {
-              const type = paramInfo && paramInfo.get('type') || null;
+              const typeExpression = paramInfo && paramInfo.get('type') || null;
               const decoratorInfo = paramInfo && paramInfo.get('decorators') || null;
               const decorators = decoratorInfo &&
                   this.reflectDecorators(decoratorInfo)
                       .filter(decorator => this.isFromCore(decorator));
-              return {type, decorators};
+              return {typeExpression, decorators};
             });
       }
     }
@@ -845,8 +874,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
   }
 
   /**
-   * Get the parameter type and decorators for a class where the information is stored on
-   * in calls to `__decorate` helpers.
+   * Get the parameter type and decorators for a class where the information is stored via
+   * calls to `__decorate` helpers.
    *
    * Reflect over the helpers to find the decorators and types about each of
    * the class's constructor parameters.
@@ -857,7 +886,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    */
   protected getParamInfoFromHelperCall(
       classSymbol: ts.Symbol, parameterNodes: ts.ParameterDeclaration[]): ParamInfo[] {
-    const parameters: ParamInfo[] = parameterNodes.map(() => ({type: null, decorators: null}));
+    const parameters: ParamInfo[] =
+        parameterNodes.map(() => ({typeExpression: null, decorators: null}));
     const helperCalls = this.getHelperCallsForClass(classSymbol, '__decorate');
     helperCalls.forEach(helperCall => {
       const {classDecorators} =
@@ -871,7 +901,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
                 metadataArg.text === 'design:paramtypes';
             const types = typesArg && ts.isArrayLiteralExpression(typesArg) && typesArg.elements;
             if (isParamTypeDecorator && types) {
-              types.forEach((type, index) => parameters[index].type = type);
+              types.forEach((type, index) => parameters[index].typeExpression = type);
             }
             break;
           case '__param':
@@ -1000,9 +1030,9 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * @param dtsProgram The program containing all the typings files.
    * @returns a map of class names to class declarations.
    */
-  protected computeDtsClassMap(dtsRootFileName: string, dtsProgram: ts.Program):
-      Map<string, ts.ClassDeclaration> {
-    const dtsClassMap = new Map<string, ts.ClassDeclaration>();
+  protected computeDtsDeclarationMap(dtsRootFileName: string, dtsProgram: ts.Program):
+      Map<string, ts.Declaration> {
+    const dtsDeclarationMap = new Map<string, ts.Declaration>();
     const checker = dtsProgram.getTypeChecker();
 
     // First add all the classes that are publicly exported from the entry-point
@@ -1010,13 +1040,38 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     if (!rootFile) {
       throw new Error(`The given file ${dtsRootFileName} is not part of the typings program.`);
     }
-    collectExportedClasses(checker, dtsClassMap, rootFile);
+    collectExportedDeclarations(checker, dtsDeclarationMap, rootFile);
 
     // Now add any additional classes that are exported from individual  dts files,
     // but are not publicly exported from the entry-point.
     dtsProgram.getSourceFiles().forEach(
-        sourceFile => { collectExportedClasses(checker, dtsClassMap, sourceFile); });
-    return dtsClassMap;
+        sourceFile => { collectExportedDeclarations(checker, dtsDeclarationMap, sourceFile); });
+    return dtsDeclarationMap;
+  }
+
+  /**
+   * Parse the given node, to see if it is a function that returns a `ModuleWithProviders` object.
+   * @param node a node to check to see if it is a function that returns a `ModuleWithProviders`
+   * object.
+   * @returns info about the function if it does return a `ModuleWithProviders` object; `null`
+   * otherwise.
+   */
+  protected parseForModuleWithProviders(node: ts.Node|null): ModuleWithProvidersFunction|null {
+    const declaration =
+        node && (ts.isFunctionDeclaration(node) || ts.isMethodDeclaration(node)) ? node : null;
+    const body = declaration ? this.getDefinitionOfFunction(declaration).body : null;
+    const lastStatement = body && body[body.length - 1];
+    const returnExpression =
+        lastStatement && ts.isReturnStatement(lastStatement) && lastStatement.expression || null;
+    const ngModuleProperty = returnExpression && ts.isObjectLiteralExpression(returnExpression) &&
+            returnExpression.properties.find(
+                prop =>
+                    !!prop.name && ts.isIdentifier(prop.name) && prop.name.text === 'ngModule') ||
+        null;
+    const ngModule = ngModuleProperty && ts.isPropertyAssignment(ngModuleProperty) &&
+            ts.isIdentifier(ngModuleProperty.initializer) && ngModuleProperty.initializer ||
+        null;
+    return ngModule && declaration && {ngModule, declaration};
   }
 }
 
@@ -1024,7 +1079,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
 
 export type ParamInfo = {
   decorators: Decorator[] | null,
-  type: ts.Expression | null
+  typeExpression: ts.Expression | null
 };
 
 /**
@@ -1127,8 +1182,10 @@ function isThisAssignment(node: ts.Declaration): node is ts.BinaryExpression&
       node.left.expression.kind === ts.SyntaxKind.ThisKeyword;
 }
 
-function isNamedDeclaration(node: ts.Declaration): node is ts.NamedDeclaration {
-  return !!(node as any).name;
+function isNamedDeclaration(node: ts.Declaration): node is ts.NamedDeclaration&
+    {name: ts.Identifier} {
+  const anyNode: any = node;
+  return !!anyNode.name && ts.isIdentifier(anyNode.name);
 }
 
 
@@ -1151,13 +1208,11 @@ function getFarLeftIdentifier(propertyAccess: ts.PropertyAccessExpression): ts.I
 }
 
 /**
- * Search a source file for exported classes, storing them in the provided `dtsClassMap`.
- * @param checker The typechecker for the source program.
- * @param dtsClassMap The map in which to store the collected exported classes.
- * @param srcFile The source file to search for exported classes.
+ * Collect mappings between exported declarations in a source file and its associated
+ * declaration in the typings program.
  */
-function collectExportedClasses(
-    checker: ts.TypeChecker, dtsClassMap: Map<string, ts.ClassDeclaration>,
+function collectExportedDeclarations(
+    checker: ts.TypeChecker, dtsDeclarationMap: Map<string, ts.Declaration>,
     srcFile: ts.SourceFile): void {
   const srcModule = srcFile && checker.getSymbolAtLocation(srcFile);
   const moduleExports = srcModule && checker.getExportsOfModule(srcModule);
@@ -1168,8 +1223,8 @@ function collectExportedClasses(
       }
       const declaration = exportedSymbol.valueDeclaration;
       const name = exportedSymbol.name;
-      if (declaration && ts.isClassDeclaration(declaration) && !dtsClassMap.has(name)) {
-        dtsClassMap.set(name, declaration);
+      if (declaration && !dtsDeclarationMap.has(name)) {
+        dtsDeclarationMap.set(name, declaration);
       }
     });
   }

packages/compiler-cli/src/ngcc/src/host/esm5_host.ts

@@ -38,7 +38,9 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
   /**
    * Check whether the given node actually represents a class.
    */
-  isClass(node: ts.Node): boolean { return super.isClass(node) || !!this.getClassSymbol(node); }
+  isClass(node: ts.Node): node is ts.NamedDeclaration {
+    return super.isClass(node) || !!this.getClassSymbol(node);
+  }
 
   /**
    * Find a symbol for a node that we think is a class.
@@ -173,10 +175,10 @@ export class Esm5ReflectionHost extends Esm2015ReflectionHost {
     if (expression && ts.isArrayLiteralExpression(expression)) {
       const elements = expression.elements;
       return elements.map(reflectArrayElement).map(paramInfo => {
-        const type = paramInfo && paramInfo.get('type') || null;
+        const typeExpression = paramInfo && paramInfo.get('type') || null;
         const decoratorInfo = paramInfo && paramInfo.get('decorators') || null;
         const decorators = decoratorInfo && this.reflectDecorators(decoratorInfo);
-        return {type, decorators};
+        return {typeExpression, decorators};
       });
     }
     return null;

packages/compiler-cli/src/ngcc/src/host/ngcc_host.ts

@@ -19,6 +19,21 @@ export function isSwitchableVariableDeclaration(node: ts.Node):
       ts.isIdentifier(node.initializer) && node.initializer.text.endsWith(PRE_R3_MARKER);
 }
 
+/**
+ * A structure returned from `getModuleWithProviderInfo` that describes functions
+ * that return ModuleWithProviders objects.
+ */
+export interface ModuleWithProvidersFunction {
+  /**
+   * The declaration of the function that returns the `ModuleWithProviders` object.
+   */
+  declaration: ts.SignatureDeclaration;
+  /**
+   * The identifier of the `ngModule` property on the `ModuleWithProviders` object.
+   */
+  ngModule: ts.Identifier;
+}
+
 /**
  * A reflection host that has extra methods for looking at non-Typescript package formats
  */
@@ -45,4 +60,13 @@ export interface NgccReflectionHost extends ReflectionHost {
    * @returns An array of decorated classes.
    */
   findDecoratedClasses(sourceFile: ts.SourceFile): DecoratedClass[];
+
+  /**
+   * Search the given source file for exported functions and static class methods that return
+   * ModuleWithProviders objects.
+   * @param f The source file to search for these functions
+   * @returns An array of info items about each of the functions that return ModuleWithProviders
+   * objects.
+   */
+  getModuleWithProvidersFunctions(f: ts.SourceFile): ModuleWithProvidersFunction[];
 }

packages/compiler-cli/src/ngcc/src/main.ts

@@ -8,6 +8,7 @@
 import * as path from 'canonical-path';
 import * as yargs from 'yargs';
 
+import {checkMarkerFile, writeMarkerFile} from './packages/build_marker';
 import {DependencyHost} from './packages/dependency_host';
 import {DependencyResolver} from './packages/dependency_resolver';
 import {EntryPointFormat} from './packages/entry_point';
@@ -59,6 +60,11 @@ export function mainNgcc(args: string[]): number {
       const dtsTransformFormat: EntryPointFormat = entryPoint.fesm2015 ? 'fesm2015' : 'esm2015';
 
       formats.forEach(format => {
+        if (checkMarkerFile(entryPoint, format)) {
+          console.warn(`Skipping ${entryPoint.name} : ${format} (already built).`);
+          return;
+        }
+
         const bundle =
             makeEntryPointBundle(entryPoint, isCore, format, format === dtsTransformFormat);
         if (bundle === null) {
@@ -67,6 +73,9 @@ export function mainNgcc(args: string[]): number {
         } else {
           transformer.transform(entryPoint, isCore, bundle);
         }
+
+        // Write the built-with-ngcc marker
+        writeMarkerFile(entryPoint, format);
       });
     });
   } catch (e) {

packages/compiler-cli/src/ngcc/src/packages/transformer.ts

@@ -8,11 +8,13 @@
 import {dirname} from 'canonical-path';
 import {existsSync, writeFileSync} from 'fs';
 import {mkdir, mv} from 'shelljs';
+import * as ts from 'typescript';
 
-import {DecorationAnalyzer} from '../analysis/decoration_analyzer';
+import {CompiledFile, DecorationAnalyzer} from '../analysis/decoration_analyzer';
+import {ModuleWithProvidersAnalyses, ModuleWithProvidersAnalyzer} from '../analysis/module_with_providers_analyzer';
 import {NgccReferencesRegistry} from '../analysis/ngcc_references_registry';
-import {PrivateDeclarationsAnalyzer} from '../analysis/private_declarations_analyzer';
-import {SwitchMarkerAnalyzer} from '../analysis/switch_marker_analyzer';
+import {ExportInfo, PrivateDeclarationsAnalyzer} from '../analysis/private_declarations_analyzer';
+import {SwitchMarkerAnalyses, SwitchMarkerAnalyzer} from '../analysis/switch_marker_analyzer';
 import {Esm2015ReflectionHost} from '../host/esm2015_host';
 import {Esm5ReflectionHost} from '../host/esm5_host';
 import {NgccReflectionHost} from '../host/ngcc_host';
@@ -20,10 +22,11 @@ import {Esm5Renderer} from '../rendering/esm5_renderer';
 import {EsmRenderer} from '../rendering/esm_renderer';
 import {FileInfo, Renderer} from '../rendering/renderer';
 
-import {checkMarkerFile, writeMarkerFile} from './build_marker';
 import {EntryPoint} from './entry_point';
 import {EntryPointBundle} from './entry_point_bundle';
 
+
+
 /**
  * A Package is stored in a directory on disk and that directory can contain one or more package
  * formats - e.g. fesm2015, UMD, etc. Additionally, each package provides typings (`.d.ts` files).
@@ -53,29 +56,22 @@ export class Transformer {
    * @param bundle the bundle to transform.
    */
   transform(entryPoint: EntryPoint, isCore: boolean, bundle: EntryPointBundle): void {
-    if (checkMarkerFile(entryPoint, bundle.format)) {
-      console.warn(`Skipping ${entryPoint.name} : ${bundle.format} (already built).`);
-      return;
-    }
-
     console.warn(`Compiling ${entryPoint.name} - ${bundle.format}`);
 
     const reflectionHost = this.getHost(isCore, bundle);
 
     // Parse and analyze the files.
-    const {decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses} =
-        this.analyzeProgram(reflectionHost, isCore, bundle);
+    const {decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
+           moduleWithProvidersAnalyses} = this.analyzeProgram(reflectionHost, isCore, bundle);
 
     // Transform the source files and source maps.
     const renderer = this.getRenderer(reflectionHost, isCore, bundle);
     const renderedFiles = renderer.renderProgram(
-        decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses);
+        decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
+        moduleWithProvidersAnalyses);
 
     // Write out all the transformed files.
     renderedFiles.forEach(file => this.writeFile(file));
-
-    // Write the built-with-ngcc marker
-    writeMarkerFile(entryPoint, bundle.format);
   }
 
   getHost(isCore: boolean, bundle: EntryPointBundle): NgccReflectionHost {
@@ -105,19 +101,30 @@ export class Transformer {
     }
   }
 
-  analyzeProgram(reflectionHost: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle) {
+  analyzeProgram(reflectionHost: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle):
+      ProgramAnalyses {
     const typeChecker = bundle.src.program.getTypeChecker();
     const referencesRegistry = new NgccReferencesRegistry(reflectionHost);
+
+    const switchMarkerAnalyzer = new SwitchMarkerAnalyzer(reflectionHost);
+    const switchMarkerAnalyses = switchMarkerAnalyzer.analyzeProgram(bundle.src.program);
+
     const decorationAnalyzer = new DecorationAnalyzer(
         typeChecker, reflectionHost, referencesRegistry, bundle.rootDirs, isCore);
-    const switchMarkerAnalyzer = new SwitchMarkerAnalyzer(reflectionHost);
+    const decorationAnalyses = decorationAnalyzer.analyzeProgram(bundle.src.program);
+
+    const moduleWithProvidersAnalyzer =
+        bundle.dts && new ModuleWithProvidersAnalyzer(reflectionHost, referencesRegistry);
+    const moduleWithProvidersAnalyses = moduleWithProvidersAnalyzer &&
+        moduleWithProvidersAnalyzer.analyzeProgram(bundle.src.program);
+
     const privateDeclarationsAnalyzer =
         new PrivateDeclarationsAnalyzer(reflectionHost, referencesRegistry);
-    const decorationAnalyses = decorationAnalyzer.analyzeProgram(bundle.src.program);
-    const switchMarkerAnalyses = switchMarkerAnalyzer.analyzeProgram(bundle.src.program);
     const privateDeclarationsAnalyses =
         privateDeclarationsAnalyzer.analyzeProgram(bundle.src.program);
-    return {decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses};
+
+    return {decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
+            moduleWithProvidersAnalyses};
   }
 
   writeFile(file: FileInfo): void {
@@ -129,3 +136,11 @@ export class Transformer {
     writeFileSync(file.path, file.contents, 'utf8');
   }
 }
+
+
+interface ProgramAnalyses {
+  decorationAnalyses: Map<ts.SourceFile, CompiledFile>;
+  switchMarkerAnalyses: SwitchMarkerAnalyses;
+  privateDeclarationsAnalyses: ExportInfo[];
+  moduleWithProvidersAnalyses: ModuleWithProvidersAnalyses|null;
+}

packages/compiler-cli/src/ngcc/src/rendering/esm_renderer.ts

@@ -10,8 +10,7 @@ import MagicString from 'magic-string';
 import * as ts from 'typescript';
 import {NgccReflectionHost, POST_R3_MARKER, PRE_R3_MARKER, SwitchableVariableDeclaration} from '../host/ngcc_host';
 import {CompiledClass} from '../analysis/decoration_analyzer';
-import {ExportInfo} from '../analysis/private_declarations_analyzer';
-import {Renderer, stripExtension} from './renderer';
+import {RedundantDecoratorMap, Renderer, stripExtension} from './renderer';
 import {EntryPointBundle} from '../packages/entry_point_bundle';
 
 export class EsmRenderer extends Renderer {
@@ -71,7 +70,7 @@ export class EsmRenderer extends Renderer {
   /**
    * Remove static decorator properties from classes
    */
-  removeDecorators(output: MagicString, decoratorsToRemove: Map<ts.Node, ts.Node[]>): void {
+  removeDecorators(output: MagicString, decoratorsToRemove: RedundantDecoratorMap): void {
     decoratorsToRemove.forEach((nodesToRemove, containerNode) => {
       if (ts.isArrayLiteralExpression(containerNode)) {
         const items = containerNode.elements;

packages/compiler-cli/src/ngcc/src/rendering/renderer.ts

@@ -15,9 +15,10 @@ import * as ts from 'typescript';
 
 import {Decorator} from '../../../ngtsc/host';
 import {CompileResult} from '@angular/compiler-cli/src/ngtsc/transform';
-import {translateStatement, translateType} from '../../../ngtsc/translator';
+import {translateStatement, translateType, ImportManager} from '../../../ngtsc/translator';
 import {NgccImportManager} from './ngcc_import_manager';
 import {CompiledClass, CompiledFile, DecorationAnalyses} from '../analysis/decoration_analyzer';
+import {ModuleWithProvidersInfo, ModuleWithProvidersAnalyses} from '../analysis/module_with_providers_analyzer';
 import {PrivateDeclarationsAnalyses, ExportInfo} from '../analysis/private_declarations_analyzer';
 import {SwitchMarkerAnalyses, SwitchMarkerAnalysis} from '../analysis/switch_marker_analyzer';
 import {IMPORT_PREFIX} from '../constants';
@@ -49,6 +50,28 @@ interface DtsClassInfo {
   compilation: CompileResult[];
 }
 
+/**
+ * A structure that captures information about what needs to be rendered
+ * in a typings file.
+ *
+ * It is created as a result of processing the analysis passed to the renderer.
+ *
+ * The `renderDtsFile()` method consumes it when rendering a typings file.
+ */
+class DtsRenderInfo {
+  classInfo: DtsClassInfo[] = [];
+  moduleWithProviders: ModuleWithProvidersInfo[] = [];
+  privateExports: ExportInfo[] = [];
+}
+
+/**
+ * The collected decorators that have become redundant after the compilation
+ * of Ivy static fields. The map is keyed by the container node, such that we
+ * can tell if we should remove the entire decorator property
+ */
+export type RedundantDecoratorMap = Map<ts.Node, ts.Node[]>;
+export const RedundantDecoratorMap = Map;
+
 /**
  * A base-class for rendering an `AnalyzedFile`.
  *
@@ -63,7 +86,8 @@ export abstract class Renderer {
 
   renderProgram(
       decorationAnalyses: DecorationAnalyses, switchMarkerAnalyses: SwitchMarkerAnalyses,
-      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses): FileInfo[] {
+      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses,
+      moduleWithProvidersAnalyses: ModuleWithProvidersAnalyses|null): FileInfo[] {
     const renderedFiles: FileInfo[] = [];
 
     // Transform the source files.
@@ -79,16 +103,16 @@ export abstract class Renderer {
 
     // Transform the .d.ts files
     if (this.bundle.dts) {
-      const dtsFiles = this.getTypingsFilesToRender(decorationAnalyses);
+      const dtsFiles = this.getTypingsFilesToRender(
+          decorationAnalyses, privateDeclarationsAnalyses, moduleWithProvidersAnalyses);
 
       // If the dts entry-point is not already there (it did not have compiled classes)
       // then add it now, to ensure it gets its extra exports rendered.
       if (!dtsFiles.has(this.bundle.dts.file)) {
-        dtsFiles.set(this.bundle.dts.file, []);
+        dtsFiles.set(this.bundle.dts.file, new DtsRenderInfo());
       }
       dtsFiles.forEach(
-          (classes, file) => renderedFiles.push(
-              ...this.renderDtsFile(file, classes, privateDeclarationsAnalyses)));
+          (renderInfo, file) => renderedFiles.push(...this.renderDtsFile(file, renderInfo)));
     }
 
     return renderedFiles;
@@ -113,12 +137,15 @@ export abstract class Renderer {
 
     if (compiledFile) {
       const importManager = new NgccImportManager(this.bundle.isFlat, this.isCore, IMPORT_PREFIX);
-      const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+
+      // TODO: remove constructor param metadata and property decorators (we need info from the
+      // handlers to do this)
+      const decoratorsToRemove = this.computeDecoratorsToRemove(compiledFile.compiledClasses);
+      this.removeDecorators(outputText, decoratorsToRemove);
 
       compiledFile.compiledClasses.forEach(clazz => {
         const renderedDefinition = renderDefinitions(compiledFile.sourceFile, clazz, importManager);
         this.addDefinitions(outputText, clazz, renderedDefinition);
-        this.trackDecorators(clazz.decorators, decoratorsToRemove);
       });
 
       this.addConstants(
@@ -129,10 +156,6 @@ export abstract class Renderer {
       this.addImports(
           outputText, importManager.getAllImports(
                           compiledFile.sourceFile.fileName, this.bundle.src.r3SymbolsFile));
-
-      // TODO: remove constructor param metadata and property decorators (we need info from the
-      // handlers to do this)
-      this.removeDecorators(outputText, decoratorsToRemove);
     }
 
     // Add exports to the entry-point file
@@ -144,14 +167,12 @@ export abstract class Renderer {
     return this.renderSourceAndMap(sourceFile, input, outputText);
   }
 
-  renderDtsFile(
-      dtsFile: ts.SourceFile, dtsClasses: DtsClassInfo[],
-      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses): FileInfo[] {
+  renderDtsFile(dtsFile: ts.SourceFile, renderInfo: DtsRenderInfo): FileInfo[] {
     const input = this.extractSourceMap(dtsFile);
     const outputText = new MagicString(input.source);
     const importManager = new NgccImportManager(false, this.isCore, IMPORT_PREFIX);
 
-    dtsClasses.forEach(dtsClass => {
+    renderInfo.classInfo.forEach(dtsClass => {
       const endOfClass = dtsClass.dtsDeclaration.getEnd();
       dtsClass.compilation.forEach(declaration => {
         const type = translateType(declaration.type, importManager);
@@ -160,26 +181,67 @@ export abstract class Renderer {
       });
     });
 
+    this.addModuleWithProvidersParams(outputText, renderInfo.moduleWithProviders, importManager);
     this.addImports(
         outputText, importManager.getAllImports(dtsFile.fileName, this.bundle.dts !.r3SymbolsFile));
 
-    if (dtsFile === this.bundle.dts !.file) {
-      const dtsExports = privateDeclarationsAnalyses.map(e => {
-        if (!e.dtsFrom) {
-          throw new Error(
-              `There is no typings path for ${e.identifier} in ${e.from}.\n` +
-              `We need to add an export for this class to a .d.ts typings file because ` +
-              `Angular compiler needs to be able to reference this class in compiled code, such as templates.\n` +
-              `The simplest fix for this is to ensure that this class is exported from the package's entry-point.`);
-        }
-        return {identifier: e.identifier, from: e.dtsFrom};
-      });
-      this.addExports(outputText, dtsFile.fileName, dtsExports);
-    }
+    this.addExports(outputText, dtsFile.fileName, renderInfo.privateExports);
+
 
     return this.renderSourceAndMap(dtsFile, input, outputText);
   }
 
+  /**
+   * Add the type parameters to the appropriate functions that return `ModuleWithProviders`
+   * structures.
+   *
+   * This function only gets called on typings files, so it doesn't need different implementations
+   * for each bundle format.
+   */
+  protected addModuleWithProvidersParams(
+      outputText: MagicString, moduleWithProviders: ModuleWithProvidersInfo[],
+      importManager: NgccImportManager): void {
+    moduleWithProviders.forEach(info => {
+      const ngModuleName = (info.ngModule.node as ts.ClassDeclaration).name !.text;
+      const declarationFile = info.declaration.getSourceFile().fileName;
+      const ngModuleFile = info.ngModule.node.getSourceFile().fileName;
+      const importPath = info.ngModule.viaModule ||
+          (declarationFile !== ngModuleFile ?
+               stripExtension(`./${relative(dirname(declarationFile), ngModuleFile)}`) :
+               null);
+      const ngModule = getImportString(importManager, importPath, ngModuleName);
+
+      if (info.declaration.type) {
+        const typeName = info.declaration.type && ts.isTypeReferenceNode(info.declaration.type) ?
+            info.declaration.type.typeName :
+            null;
+        if (this.isCoreModuleWithProvidersType(typeName)) {
+          // The declaration already returns `ModuleWithProvider` but it needs the `NgModule` type
+          // parameter adding.
+          outputText.overwrite(
+              info.declaration.type.getStart(), info.declaration.type.getEnd(),
+              `ModuleWithProviders<${ngModule}>`);
+        } else {
+          // The declaration returns an unknown type so we need to convert it to a union that
+          // includes the ngModule property.
+          const originalTypeString = info.declaration.type.getText();
+          outputText.overwrite(
+              info.declaration.type.getStart(), info.declaration.type.getEnd(),
+              `(${originalTypeString})&{ngModule:${ngModule}}`);
+        }
+      } else {
+        // The declaration has no return type so provide one.
+        const lastToken = info.declaration.getLastToken();
+        const insertPoint = lastToken && lastToken.kind === ts.SyntaxKind.SemicolonToken ?
+            lastToken.getStart() :
+            info.declaration.getEnd();
+        outputText.appendLeft(
+            insertPoint,
+            `: ${getImportString(importManager, '@angular/core', 'ModuleWithProviders')}<${ngModule}>`);
+      }
+    });
+  }
+
   protected abstract addConstants(output: MagicString, constants: string, file: ts.SourceFile):
       void;
   protected abstract addImports(output: MagicString, imports: {name: string, as: string}[]): void;
@@ -190,25 +252,31 @@ export abstract class Renderer {
   protected abstract addDefinitions(
       output: MagicString, compiledClass: CompiledClass, definitions: string): void;
   protected abstract removeDecorators(
-      output: MagicString, decoratorsToRemove: Map<ts.Node, ts.Node[]>): void;
+      output: MagicString, decoratorsToRemove: RedundantDecoratorMap): void;
   protected abstract rewriteSwitchableDeclarations(
       outputText: MagicString, sourceFile: ts.SourceFile,
       declarations: SwitchableVariableDeclaration[]): void;
 
   /**
-   * Add the decorator nodes that are to be removed to a map
-   * So that we can tell if we should remove the entire decorator property
+   * From the given list of classes, computes a map of decorators that should be removed.
+   * The decorators to remove are keyed by their container node, such that we can tell if
+   * we should remove the entire decorator property.
+   * @param classes The list of classes that may have decorators to remove.
+   * @returns A map of decorators to remove, keyed by their container node.
    */
-  protected trackDecorators(decorators: Decorator[], decoratorsToRemove: Map<ts.Node, ts.Node[]>):
-      void {
-    decorators.forEach(dec => {
-      const decoratorArray = dec.node.parent !;
-      if (!decoratorsToRemove.has(decoratorArray)) {
-        decoratorsToRemove.set(decoratorArray, [dec.node]);
-      } else {
-        decoratorsToRemove.get(decoratorArray) !.push(dec.node);
-      }
+  protected computeDecoratorsToRemove(classes: CompiledClass[]): RedundantDecoratorMap {
+    const decoratorsToRemove = new RedundantDecoratorMap();
+    classes.forEach(clazz => {
+      clazz.decorators.forEach(dec => {
+        const decoratorArray = dec.node.parent !;
+        if (!decoratorsToRemove.has(decoratorArray)) {
+          decoratorsToRemove.set(decoratorArray, [dec.node]);
+        } else {
+          decoratorsToRemove.get(decoratorArray) !.push(dec.node);
+        }
+      });
     });
+    return decoratorsToRemove;
   }
 
   /**
@@ -289,22 +357,67 @@ export abstract class Renderer {
     return result;
   }
 
-  protected getTypingsFilesToRender(analyses: DecorationAnalyses):
-      Map<ts.SourceFile, DtsClassInfo[]> {
-    const dtsMap = new Map<ts.SourceFile, DtsClassInfo[]>();
-    analyses.forEach(compiledFile => {
+  protected getTypingsFilesToRender(
+      decorationAnalyses: DecorationAnalyses,
+      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses,
+      moduleWithProvidersAnalyses: ModuleWithProvidersAnalyses|
+      null): Map<ts.SourceFile, DtsRenderInfo> {
+    const dtsMap = new Map<ts.SourceFile, DtsRenderInfo>();
+
+    // Capture the rendering info from the decoration analyses
+    decorationAnalyses.forEach(compiledFile => {
       compiledFile.compiledClasses.forEach(compiledClass => {
-        const dtsDeclaration = this.host.getDtsDeclarationOfClass(compiledClass.declaration);
+        const dtsDeclaration = this.host.getDtsDeclaration(compiledClass.declaration);
         if (dtsDeclaration) {
           const dtsFile = dtsDeclaration.getSourceFile();
-          const classes = dtsMap.get(dtsFile) || [];
-          classes.push({dtsDeclaration, compilation: compiledClass.compilation});
-          dtsMap.set(dtsFile, classes);
+          const renderInfo = dtsMap.get(dtsFile) || new DtsRenderInfo();
+          renderInfo.classInfo.push({dtsDeclaration, compilation: compiledClass.compilation});
+          dtsMap.set(dtsFile, renderInfo);
         }
       });
     });
+
+    // Capture the ModuleWithProviders functions/methods that need updating
+    if (moduleWithProvidersAnalyses !== null) {
+      moduleWithProvidersAnalyses.forEach((moduleWithProvidersToFix, dtsFile) => {
+        const renderInfo = dtsMap.get(dtsFile) || new DtsRenderInfo();
+        renderInfo.moduleWithProviders = moduleWithProvidersToFix;
+        dtsMap.set(dtsFile, renderInfo);
+      });
+    }
+
+    // Capture the private declarations that need to be re-exported
+    if (privateDeclarationsAnalyses.length) {
+      const dtsExports = privateDeclarationsAnalyses.map(e => {
+        if (!e.dtsFrom) {
+          throw new Error(
+              `There is no typings path for ${e.identifier} in ${e.from}.\n` +
+              `We need to add an export for this class to a .d.ts typings file because ` +
+              `Angular compiler needs to be able to reference this class in compiled code, such as templates.\n` +
+              `The simplest fix for this is to ensure that this class is exported from the package's entry-point.`);
+        }
+        return {identifier: e.identifier, from: e.dtsFrom};
+      });
+      const dtsEntryPoint = this.bundle.dts !.file;
+      const renderInfo = dtsMap.get(dtsEntryPoint) || new DtsRenderInfo();
+      renderInfo.privateExports = dtsExports;
+      dtsMap.set(dtsEntryPoint, renderInfo);
+    }
+
     return dtsMap;
   }
+
+  /**
+   * Check whether the given type is the core Angular `ModuleWithProviders` interface.
+   * @param typeName The type to check.
+   * @returns true if the type is the core Angular `ModuleWithProviders` interface.
+   */
+  private isCoreModuleWithProvidersType(typeName: ts.EntityName|null) {
+    const id =
+        typeName && ts.isIdentifier(typeName) ? this.host.getImportOfIdentifier(typeName) : null;
+    return (
+        id && id.name === 'ModuleWithProviders' && (this.isCore || id.from === '@angular/core'));
+  }
 }
 
 /**
@@ -373,7 +486,7 @@ export function renderDefinitions(
 }
 
 export function stripExtension(filePath: string): string {
-  return filePath.replace(/\.(js|d\.ts$)/, '');
+  return filePath.replace(/\.(js|d\.ts)$/, '');
 }
 
 /**
@@ -386,3 +499,9 @@ function createAssignmentStatement(
   const receiver = new WrappedNodeExpr(receiverName);
   return new WritePropExpr(receiver, propName, initializer).toStmt();
 }
+
+function getImportString(
+    importManager: ImportManager, importPath: string | null, importName: string) {
+  const importAs = importPath ? importManager.generateNamedImport(importPath, importName) : null;
+  return importAs ? `${importAs.moduleImport}.${importAs.symbol}` : `${importName}`;
+}