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

.bazelignore

@@ -1,3 +1,4 @@
 node_modules
 dist
 aio/node_modules
+aio/tools/examples/shared/node_modules

.bazelrc

@@ -71,7 +71,7 @@ test --experimental_ui
 ################################
 # Temporary Settings for Ivy   #
 ################################
-# to determine if the compiler used should be Ivy or ViewEngine one can use `--define=compile=local` on
+# 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
 

.circleci/config.yml

@@ -323,7 +323,6 @@ jobs:
           root: dist
           paths:
             - packages-dist
-            - packages-dist-ivy-jit
             - packages-dist-ivy-aot
 
   # We run the integration tests outside of Bazel for now.

.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/angular-robot.yml

@@ -81,7 +81,7 @@ merge:
     # 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
@@ -102,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,541 +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/*"
-        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

CHANGELOG.md

@@ -1,3 +1,30 @@
+<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)
 
@@ -17,6 +44,19 @@
 
 
 
+<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)
 
@@ -43,6 +83,47 @@
 * **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)
+
+
+### Bug Fixes
+
+* **bazel:** do not throw error when writing tsickle externs ([#27200](https://github.com/angular/angular/issues/27200)) ([20a2bae](https://github.com/angular/angular/commit/20a2bae))
+* **bazel:** do not throw if ts compile action does not create esm5 outputs ([#27401](https://github.com/angular/angular/issues/27401)) ([c61a8b7](https://github.com/angular/angular/commit/c61a8b7))
+* **bazel:** ng_package cannot be run multiple times without clean ([#27200](https://github.com/angular/angular/issues/27200)) ([4f93749](https://github.com/angular/angular/commit/4f93749))
+* **bazel:** ng_package not generating UMD bundles on windows ([#27200](https://github.com/angular/angular/issues/27200)) ([7d59880](https://github.com/angular/angular/commit/7d59880))
+* **bazel:** ng_package should correctly map to source maps in secondary entry-points ([#27313](https://github.com/angular/angular/issues/27313)) ([eb17502](https://github.com/angular/angular/commit/eb17502)), closes [#25510](https://github.com/angular/angular/issues/25510)
+* **bazel:** Respect existing angular installation ([#27495](https://github.com/angular/angular/issues/27495)) ([4da739a](https://github.com/angular/angular/commit/4da739a))
+* **common:** expose request url in network error ([#27143](https://github.com/angular/angular/issues/27143)) ([1db53da](https://github.com/angular/angular/commit/1db53da)), closes [#27029](https://github.com/angular/angular/issues/27029)
+* **compiler-cli:** flatModuleIndex files not generated on windows with multiple input files ([#27200](https://github.com/angular/angular/issues/27200)) ([d3c08e7](https://github.com/angular/angular/commit/d3c08e7))
+* **core:** export a value for InjectFlags ([#27279](https://github.com/angular/angular/issues/27279)) ([23b06af](https://github.com/angular/angular/commit/23b06af)), closes [#27251](https://github.com/angular/angular/issues/27251)
+* **core:** More precise return type for `InjectableDecorator` ([#27360](https://github.com/angular/angular/issues/27360)) ([4b9948c](https://github.com/angular/angular/commit/4b9948c)), closes [#26942](https://github.com/angular/angular/issues/26942)
+* **forms:** apply unicode flag to pattern attribute when supported ([#20819](https://github.com/angular/angular/issues/20819)) ([3c34b8b](https://github.com/angular/angular/commit/3c34b8b))
+* **platform-server:** add [@angular](https://github.com/angular)/http to the list of peerDependencies ([#27307](https://github.com/angular/angular/issues/27307)) ([32c5be9](https://github.com/angular/angular/commit/32c5be9)), closes [#26154](https://github.com/angular/angular/issues/26154)
+* **router:** update URL after redirects when urlHandlingStrategy='eager' ([#27356](https://github.com/angular/angular/issues/27356)) ([11a8bd8](https://github.com/angular/angular/commit/11a8bd8)), closes [#27076](https://github.com/angular/angular/issues/27076)
+* **upgrade:** don't rely upon the runtime to resolve forward refs ([#27132](https://github.com/angular/angular/issues/27132)) ([a4462c2](https://github.com/angular/angular/commit/a4462c2))
+
+
+### Features
+
+* **bazel:** ng-new schematics with Bazel ([#27277](https://github.com/angular/angular/issues/27277)) ([06d4a0c](https://github.com/angular/angular/commit/06d4a0c))
+* **router:** add a Navigation type available during navigation ([#27198](https://github.com/angular/angular/issues/27198)) ([d40af0c](https://github.com/angular/angular/commit/d40af0c))
+* **router:** add pathParamsOrQueryParamsChange mode for runGuardsAndResolvers ([#27464](https://github.com/angular/angular/issues/27464)) ([d70a7f3](https://github.com/angular/angular/commit/d70a7f3)), closes [#26861](https://github.com/angular/angular/issues/26861) [#18253](https://github.com/angular/angular/issues/18253)
+* **router:** allow passing `state` to routerLink directives ([#27198](https://github.com/angular/angular/issues/27198)) ([73f6ed9](https://github.com/angular/angular/commit/73f6ed9)), closes [#24617](https://github.com/angular/angular/issues/24617)
+* **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))
+
+<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)
+
+
+### Bug Fixes
+
+* **common:** expose request url in network error ([#27143](https://github.com/angular/angular/issues/27143)) ([1db53da](https://github.com/angular/angular/commit/1db53da)), closes [#27029](https://github.com/angular/angular/issues/27029)
+* **upgrade:** don't rely upon the runtime to resolve forward refs ([#27132](https://github.com/angular/angular/issues/27132)) ([a4462c2](https://github.com/angular/angular/commit/a4462c2))
+
+
 
 <a name="7.1.1"></a>
 ## [7.1.1](https://github.com/angular/angular/compare/7.1.0...7.1.1) (2018-11-28)

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/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 02524ab82",
+    "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/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

@@ -65,14 +65,11 @@ See also: [`//.bazelrc`](https://github.com/angular/angular/blob/master/.bazelrc
 - `--test_arg=--node_options=--inspect=9228`: change the inspector port.
 - `--define=compile=<option>` Controls if ivy or legacy mode is enabled. This switches which compiler is used (ngc, ngtsc, or a tsc pass-through mode).
     - `legacy`: (default behavior) compile against View Engine, e.g. `--define=compile=legacy`
-    - `jit`: Compile in ivy JIT mode, e.g. `--define=compile=jit`
-    - `aot`: Compile in ivy AOT move, e.g. `--define=compile=aot`
+    - `aot`: Compile in ivy AOT mode, e.g. `--define=compile=aot`
 - `--test_tag_filters=<tag>`: filter tests down to tags defined in the `tag` config of your rules in any given `BUILD.bazel`.
     - `no-ivy-aot`: Useful for excluding build and test targets that are not meant to be executed in Ivy AOT mode (`--define=compile=aot`).
-    - `no-ivy-jit`: Useful for excluding build and test targets that are not meant to be executed in Ivy JIT mode (`--define=compile=jit`).
     - `ivy-only`: Useful for excluding all Ivy build and tests targets with `--define=compile=legacy`.
     - `fixme-ivy-aot`: Useful for including/excluding build and test targets that are currently broken in Ivy AOT mode (`--define=compile=aot`).
-    - `fixme-ivy-jit`: Useful for including/excluding build and test targets that are currently broken in Ivy JIT mode (`--define=compile=jit`).
 
 
 ### Debugging a Node 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/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/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/ngcc/yarn.lock

@@ -3,7 +3,7 @@
 
 
 "@angular/animations@file:../../dist/packages-dist/animations":
-  version "7.1.0-beta.1"
+  version "7.1.0"
   dependencies:
     tslib "^1.9.0"
 
@@ -17,14 +17,14 @@
     parse5 "^5.0.0"
 
 "@angular/common@file:../../dist/packages-dist/common":
-  version "7.1.0-beta.1"
+  version "7.1.0"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli":
-  version "7.1.0-beta.1"
+  version "7.1.0"
   dependencies:
-    canonical-path "0.0.2"
+    canonical-path "1.0.0"
     chokidar "^1.4.2"
     convert-source-map "^1.5.1"
     dependency-graph "^0.7.2"
@@ -33,25 +33,26 @@
     reflect-metadata "^0.1.2"
     shelljs "^0.8.1"
     source-map "^0.6.1"
+    tslib "^1.9.0"
     yargs "9.0.1"
 
 "@angular/compiler@file:../../dist/packages-dist/compiler":
-  version "7.1.0-beta.1"
+  version "7.1.0"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@file:../../dist/packages-dist/core":
-  version "7.1.0-beta.1"
+  version "7.1.0"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/forms@file:../../dist/packages-dist/forms":
-  version "7.1.0-beta.1"
+  version "7.1.0"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/http@file:../../dist/packages-dist/http":
-  version "7.1.0-beta.1"
+  version "7.1.0"
   dependencies:
     tslib "^1.9.0"
 
@@ -65,17 +66,17 @@
     parse5 "^5.0.0"
 
 "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic":
-  version "7.1.0-beta.1"
+  version "7.1.0"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
-  version "7.1.0-beta.1"
+  version "7.1.0"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/router@file:../../dist/packages-dist/router":
-  version "7.1.0-beta.1"
+  version "7.1.0"
   dependencies:
     tslib "^1.9.0"
 
@@ -533,10 +534,10 @@ camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-canonical-path@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-0.0.2.tgz#e31eb937a8c93ee2a01df1839794721902874574"
-  integrity sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ=
+canonical-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
+  integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
 
 caseless@~0.12.0:
   version "0.12.0"

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"
+  ]
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "7.1.4",
+  "version": "7.2.0-rc.0",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",
@@ -65,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",
@@ -76,9 +76,9 @@
     "shelljs": "^0.8.1",
     "source-map": "^0.6.1",
     "source-map-support": "0.5.9",
-    "tsickle": "0.33.1",
-    "tslib": "^1.7.1",
-    "typescript": "~3.1.1",
+    "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"
@@ -110,7 +110,7 @@
     "firefox-profile": "1.0.3",
     "glob": "7.1.2",
     "gulp": "3.9.1",
-    "gulp-clang-format": "1.0.27",
+    "gulp-clang-format": "1.0.23",
     "gulp-connect": "5.0.0",
     "gulp-conventional-changelog": "^2.0.3",
     "gulp-filter": "^5.1.0",

packages/bazel/BUILD.bazel

@@ -7,6 +7,7 @@ npm_package(
         "package.json",
         "protractor-utils.js",
         "//packages/bazel/src:package_assets",
+        "//packages/bazel/src/builders:package_assets",
         "//packages/bazel/src/schematics:package_assets",
     ],
     packages = [
@@ -22,5 +23,6 @@ npm_package(
         "//packages/bazel/src/ngc-wrapped:ngc_lib",
         "//packages/bazel/src/protractor/utils",
         "//packages/bazel/src/schematics/bazel-workspace",
+        "//packages/bazel/src/schematics/ng-new",
     ],
 )

packages/bazel/package.json

@@ -24,7 +24,7 @@
   },
   "peerDependencies": {
     "@angular/compiler-cli": "0.0.0-PLACEHOLDER",
-    "typescript": ">=3.1.1 <3.2"
+    "typescript": ">=3.1.1 <3.3"
   },
   "repository": {
     "type": "git",
@@ -38,4 +38,4 @@
   "scripts": {
     "postinstall": "node ./check_version.js"
   }
-}
+}

packages/bazel/src/builders/builders.json

@@ -1,7 +1,7 @@
 {
   "builders": {
     "build": {
-      "class": "./index#Builder",
+      "class": "./index",
       "schema": "./schema.json",
       "description": "Executes Bazel on a target."
     }

packages/bazel/src/builders/index.ts

@@ -5,10 +5,10 @@
  * 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
  *
- * @fileoverview Bazel bundle builder
+ * @fileoverview Bazel builder
  */
 
-import {BuildEvent, Builder as BuilderInterface, BuilderConfiguration, BuilderContext} from '@angular-devkit/architect';
+import {BuildEvent, Builder, BuilderConfiguration, BuilderContext} from '@angular-devkit/architect';
 import {getSystemPath, resolve} from '@angular-devkit/core';
 import {Observable, of } from 'rxjs';
 import {catchError, map, tap} from 'rxjs/operators';
@@ -16,7 +16,7 @@ import {catchError, map, tap} from 'rxjs/operators';
 import {checkInstallation, runBazel} from './bazel';
 import {Schema} from './schema';
 
-export class Builder implements BuilderInterface<Schema> {
+class BazelBuilder implements Builder<Schema> {
   constructor(private context: BuilderContext) {}
 
   run(builderConfig: BuilderConfiguration<Partial<Schema>>): Observable<BuildEvent> {
@@ -38,3 +38,5 @@ export class Builder implements BuilderInterface<Schema> {
         .pipe(map(() => ({success: true})), catchError(() => of ({success: false})), );
   }
 }
+
+export default BazelBuilder;

packages/bazel/src/ng_module.bzl

@@ -22,7 +22,7 @@ load(
 def compile_strategy(ctx):
     """Detect which strategy should be used to implement ng_module.
 
-    Depending on the value of the 'compile' define flag or the '_global_mode' attribute, ng_module
+    Depending on the value of the 'compile' define flag, ng_module
     can be implemented in various ways. This function reads the configuration passed by the user and
     determines which mode is active.
 
@@ -30,19 +30,16 @@ def compile_strategy(ctx):
       ctx: skylark rule execution context
 
     Returns:
-      one of 'legacy', 'aot', 'jit', or 'global' depending on the configuration in ctx
+      one of 'legacy' or 'aot' depending on the configuration in ctx
     """
 
     strategy = "legacy"
     if "compile" in ctx.var:
         strategy = ctx.var["compile"]
 
-    if strategy not in ["legacy", "aot", "jit"]:
+    if strategy not in ["legacy", "aot"]:
         fail("Unknown --define=compile value '%s'" % strategy)
 
-    if strategy == "legacy" and hasattr(ctx.attr, "_global_mode") and ctx.attr._global_mode:
-        strategy = "global"
-
     return strategy
 
 def _compiler_name(ctx):
@@ -58,12 +55,8 @@ def _compiler_name(ctx):
     strategy = compile_strategy(ctx)
     if strategy == "legacy":
         return "ngc"
-    elif strategy == "global":
-        return "ngc.ivy"
     elif strategy == "aot":
         return "ngtsc"
-    elif strategy == "jit":
-        return "tsc"
     else:
         fail("unreachable")
 
@@ -80,16 +73,12 @@ def _enable_ivy_value(ctx):
     strategy = compile_strategy(ctx)
     if strategy == "legacy":
         return False
-    elif strategy == "global":
-        return True
     elif strategy == "aot":
         return "ngtsc"
-    elif strategy == "jit":
-        return "tsc"
     else:
         fail("unreachable")
 
-def _include_ng_files(ctx):
+def _is_legacy_ngc(ctx):
     """Determines whether Angular outputs will be produced by the current compilation strategy.
 
     Args:
@@ -101,7 +90,7 @@ def _include_ng_files(ctx):
     """
 
     strategy = compile_strategy(ctx)
-    return strategy == "legacy" or strategy == "global"
+    return strategy == "legacy"
 
 def _basename_of(ctx, file):
     ext_len = len(".ts")
@@ -150,7 +139,7 @@ def _should_produce_flat_module_outs(ctx):
 # in the library. Most of these will be produced as empty files but it is
 # unknown, without parsing, which will be empty.
 def _expected_outs(ctx):
-    include_ng_files = _include_ng_files(ctx)
+    is_legacy_ngc = _is_legacy_ngc(ctx)
 
     devmode_js_files = []
     closure_js_files = []
@@ -169,21 +158,27 @@ def _expected_outs(ctx):
 
         if short_path.endswith(".ts") and not short_path.endswith(".d.ts"):
             basename = short_path[len(package_prefix):-len(".ts")]
-            if include_ng_files and (len(factory_basename_set.to_list()) == 0 or basename in factory_basename_set.to_list()):
+            if (len(factory_basename_set.to_list()) == 0 or basename in factory_basename_set.to_list()):
                 devmode_js = [
                     ".ngfactory.js",
                     ".ngsummary.js",
                     ".js",
                 ]
-                summaries = [".ngsummary.json"]
-                metadata = [".metadata.json"]
+
+                # Only ngc produces .json files, they're not needed in Ivy.
+                if is_legacy_ngc:
+                    summaries = [".ngsummary.json"]
+                    metadata = [".metadata.json"]
+                else:
+                    summaries = []
+                    metadata = []
             else:
                 devmode_js = [".js"]
                 if not _is_bazel():
                     devmode_js += [".ngfactory.js"]
                 summaries = []
                 metadata = []
-        elif include_ng_files and short_path.endswith(".css"):
+        elif is_legacy_ngc and short_path.endswith(".css"):
             basename = short_path[len(package_prefix):-len(".css")]
             devmode_js = [
                 ".css.shim.ngstyle.js",
@@ -206,19 +201,20 @@ 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 include_ng_files 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
 
     # TODO(alxhub): i18n is only produced by the legacy compiler currently. This should be re-enabled
     # when ngtsc can extract messages
-    if include_ng_files:
+    if is_legacy_ngc:
         i18n_messages_files = [ctx.new_file(ctx.genfiles_dir, ctx.label.name + "_ngc_messages.xmb")]
     else:
         i18n_messages_files = []
@@ -235,7 +231,7 @@ def _expected_outs(ctx):
 
 def _ngc_tsconfig(ctx, files, srcs, **kwargs):
     outs = _expected_outs(ctx)
-    include_ng_files = _include_ng_files(ctx)
+    is_legacy_ngc = _is_legacy_ngc(ctx)
     if "devmode_manifest" in kwargs:
         expected_outs = outs.devmode_js + outs.declarations + outs.summaries + outs.metadata
     else:
@@ -246,7 +242,7 @@ def _ngc_tsconfig(ctx, files, srcs, **kwargs):
         "generateCodeForLibraries": False,
         "allowEmptyCodegenFiles": True,
         # Summaries are only enabled if Angular outputs are to be produced.
-        "enableSummariesForJit": include_ng_files,
+        "enableSummariesForJit": is_legacy_ngc,
         "enableIvy": _enable_ivy_value(ctx),
         "fullTemplateTypeCheck": ctx.attr.type_check,
         # FIXME: wrong place to de-dupe
@@ -321,7 +317,7 @@ def ngc_compile_action(
       the parameters of the compilation which will be used to replay the ngc action for i18N.
     """
 
-    include_ng_files = _include_ng_files(ctx)
+    is_legacy_ngc = _is_legacy_ngc(ctx)
 
     mnemonic = "AngularTemplateCompile"
     progress_message = "Compiling Angular templates (%s) %s" % (_compiler_name(ctx), label)
@@ -359,7 +355,7 @@ def ngc_compile_action(
         },
     )
 
-    if include_ng_files and messages_out != None:
+    if is_legacy_ngc and messages_out != None:
         ctx.actions.run(
             inputs = list(inputs),
             outputs = messages_out,
@@ -453,7 +449,7 @@ def ng_module_impl(ctx, ts_compile_actions):
       conversion by ts_providers_dict_to_struct
     """
 
-    include_ng_files = _include_ng_files(ctx)
+    is_legacy_ngc = _is_legacy_ngc(ctx)
 
     providers = ts_compile_actions(
         ctx,
@@ -473,14 +469,14 @@ def ng_module_impl(ctx, ts_compile_actions):
 
     outs = _expected_outs(ctx)
 
-    if include_ng_files:
+    if is_legacy_ngc:
         providers["angular"] = {
             "summaries": outs.summaries,
             "metadata": outs.metadata,
         }
         providers["ngc_messages"] = outs.i18n_messages
 
-    if include_ng_files and _should_produce_flat_module_outs(ctx):
+    if is_legacy_ngc and _should_produce_flat_module_outs(ctx):
         if len(outs.metadata) > 1:
             fail("expecting exactly one metadata output for " + str(ctx.label))
 
@@ -638,16 +634,3 @@ This rule extends the [ts_library] rule.
 
 [ts_library]: http://tsetse.info/api/build_defs.html#ts_library
 """
-
-# TODO(alxhub): this rule causes legacy ngc to produce Ivy outputs from global analysis information.
-# It exists to facilitate testing of the Ivy runtime until ngtsc is mature enough to be used
-# instead, and should be removed once ngtsc is capable of fulfilling the same requirements.
-internal_global_ng_module = rule(
-    implementation = _ng_module_impl,
-    attrs = dict(NG_MODULE_RULE_ATTRS, **{
-        "_global_mode": attr.bool(
-            default = True,
-        ),
-    }),
-    outputs = COMMON_OUTPUTS,
-)

packages/bazel/src/schematics/BUILD.bazel

@@ -15,6 +15,7 @@ jasmine_node_test(
     bootstrap = ["angular/tools/testing/init_node_spec.js"],
     deps = [
         "//packages/bazel/src/schematics/bazel-workspace:test",
+        "//packages/bazel/src/schematics/ng-new:test",
         "//tools/testing:node",
     ],
 )

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

@@ -7,7 +7,15 @@ load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
 
 ng_module(
     name = "src",
-    srcs = glob(["**/*.ts"], exclude = ["**/*.spec.ts", "test.ts"]),
+    srcs = glob(
+        include = ["**/*.ts"],
+        exclude = [
+            "**/*.spec.ts",
+            "main.ts",
+            "test.ts",
+            "initialize_testbed.ts",
+        ],
+    ),
     assets = glob([
       "**/*.css",
       "**/*.html",
@@ -21,7 +29,7 @@ ng_module(
 
 rollup_bundle(
     name = "bundle",
-    entry_point = "src/main",
+    entry_point = "src/main.prod",
     deps = ["//src"],
 )
 
@@ -50,7 +58,7 @@ ts_devserver(
         "npm/node_modules/zone.js/dist",
         "npm/node_modules/tslib",
     ],
-    entry_module = "<%= utils.underscore(name) %>/src/main",
+    entry_module = "<%= utils.underscore(name) %>/src/main.dev",
     serving_path = "/bundle.min.js",
     static_files = [
         "@npm//node_modules/zone.js:dist/zone.min.js",
@@ -66,6 +74,18 @@ ts_library(
     srcs = glob(["**/*.spec.ts"]),
     deps = [
         ":src",
+        "@angular//packages/core/testing",
+        "@npm//@types",
+    ],
+)
+
+ts_library(
+    name = "initialize_testbed",
+    testonly = 1,
+    srcs = [
+        "initialize_testbed.ts",
+    ],
+    deps = [
         "@angular//packages/core/testing",
         "@angular//packages/platform-browser-dynamic/testing",
         "@npm//@types",
@@ -75,6 +95,9 @@ ts_library(
 ts_web_test_suite(
     name = "test",
     srcs = ["@npm//node_modules/tslib:tslib.js"],
+    runtime_deps = [
+        ":initialize_testbed",
+    ],
     # do not sort
     bootstrap = [
         "@npm//node_modules/zone.js:dist/zone-testing-bundle.js",

packages/bazel/src/schematics/bazel-workspace/files/src/initialize_testbed.ts.template

@@ -0,0 +1,9 @@
+/**
+ * @fileoverview Provides a script to initialize TestBed before tests are run.
+ * This file should be included in the "runtime_deps" of a "ts_web_test_suite"
+ * rule.
+ */
+import {TestBed} from '@angular/core/testing';
+import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
+
+TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());

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

@@ -67,13 +67,13 @@ export default function(options: BazelWorkspaceOptions): Rule {
 
     // If the project already has some deps installed, Bazel should use existing
     // versions.
-    const existingVersions: {[k: string]: string | null} = {
+    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];
+      const version = existingVersions[name] as string;
       if (version) {
         context.logger.info(`Bazel will reuse existing version for ${name}: ${version}`);
       }

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

@@ -48,7 +48,7 @@ describe('Bazel-workspace Schematic', () => {
     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"');
+    expect(content).toContain('entry_module = "demo_app/src/main.dev"');
   });
 
   describe('WORKSPACE', () => {

packages/bazel/src/schematics/collection.json

@@ -2,6 +2,11 @@
     "name": "@angular/bazel",
     "version": "0.1",
     "schematics": {
+      "ng-new": {
+        "factory": "./ng-new",
+        "schema": "./ng-new/schema.json",
+        "description": "Create an Angular project that builds with Bazel."
+      },
       "bazel-workspace": {
         "factory": "./bazel-workspace",
         "schema": "./bazel-workspace/schema.json",

packages/bazel/src/schematics/ng-new/BUILD.bazel

@@ -0,0 +1,36 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "ng-new",
+    srcs = [
+        "index.ts",
+        "schema.d.ts",
+    ],
+    data = glob(["files/**/*"]) + [
+        "schema.json",
+    ],
+    deps = [
+        "//packages/bazel/src/schematics/bazel-workspace",
+        "@ngdeps//@angular-devkit/core",
+        "@ngdeps//@angular-devkit/schematics",
+        "@ngdeps//@schematics/angular",
+        "@ngdeps//typescript",
+    ],
+)
+
+ts_library(
+    name = "test",
+    testonly = True,
+    srcs = [
+        "index_spec.ts",
+    ],
+    data = [
+        "//packages/bazel/src/schematics:package_assets",
+    ],
+    deps = [
+        ":ng-new",
+        "@ngdeps//@angular-devkit/schematics",
+    ],
+)

packages/bazel/src/schematics/ng-new/files/index.html.template

@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title><%= utils.classify(name) %></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>
+  <script src="/zone.min.js"></script>
+  <script src="/bundle.min.js"></script>
+</body>
+</html>

packages/bazel/src/schematics/ng-new/files/main.dev.ts.template

@@ -0,0 +1,4 @@
+import {platformBrowser} from '@angular/platform-browser';
+import {AppModuleNgFactory} from './app/app.module.ngfactory';
+
+platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);

packages/bazel/src/schematics/ng-new/files/main.prod.ts.template

@@ -0,0 +1,6 @@
+import {enableProdMode} from '@angular/core';
+import {platformBrowser} from '@angular/platform-browser';
+import {AppModuleNgFactory} from './app/app.module.ngfactory';
+
+enableProdMode();
+platformBrowser().bootstrapModuleFactory(AppModuleNgFactory);

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

@@ -0,0 +1,181 @@
+/**
+ * @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
+ *
+ * @fileoverview Schematics for ng-new project that builds with Bazel.
+ */
+
+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';
+import {getWorkspace} from '@schematics/angular/utility/config';
+import {Schema} from './schema';
+
+function addDevDependenciesToPackageJson(options: Schema) {
+  return (host: Tree) => {
+    const packageJson = `${options.name}/package.json`;
+
+    if (!host.exists(packageJson)) {
+      throw new Error(`Could not find ${packageJson}`);
+    }
+    const packageJsonContent = host.read(packageJson);
+    if (!packageJsonContent) {
+      throw new Error('Failed to read package.json content');
+    }
+    const jsonAst = parseJsonAst(packageJsonContent.toString()) as JsonAstObject;
+    const deps = findPropertyInAstObject(jsonAst, 'dependencies') as JsonAstObject;
+    const devDeps = findPropertyInAstObject(jsonAst, 'devDependencies') as JsonAstObject;
+
+    const angularCoreNode = findPropertyInAstObject(deps, '@angular/core');
+    const angularCoreVersion = angularCoreNode !.value as string;
+
+    const devDependencies: {[k: string]: string} = {
+      '@angular/bazel': angularCoreVersion,
+      // TODO(kyliau): Consider moving this to latest-versions.ts
+      '@bazel/karma': '^0.22.0',
+      '@bazel/typescript': '^0.22.0',
+    };
+
+    const recorder = host.beginUpdate(packageJson);
+    for (const packageName of Object.keys(devDependencies)) {
+      const version = devDependencies[packageName];
+      const indent = 4;
+      insertPropertyInAstObjectInOrder(recorder, devDeps, packageName, version, indent);
+    }
+    host.commitUpdate(recorder);
+    return host;
+  };
+}
+
+function overwriteMainAndIndex(options: Schema) {
+  return (host: Tree) => {
+    let newProjectRoot = '';
+    try {
+      const workspace = getWorkspace(host);
+      newProjectRoot = workspace.newProjectRoot || '';
+    } catch {
+    }
+    const srcDir = `${newProjectRoot}/${options.name}/src`;
+
+    return mergeWith(
+        apply(
+            url('./files'),
+            [
+              applyTemplates({
+                utils: strings,
+                ...options,
+                'dot': '.',
+              }),
+              move(srcDir),
+            ]),
+        MergeStrategy.Overwrite);
+  };
+}
+
+function replacePropertyInAstObject(
+    recorder: UpdateRecorder, node: JsonAstObject, propertyName: string, value: JsonValue,
+    indent: number) {
+  const property = findPropertyInAstObject(node, propertyName);
+  if (property === null) {
+    throw new Error(`Property ${propertyName} does not exist in JSON object`);
+  }
+  const {start, text} = property;
+  recorder.remove(start.offset, text.length);
+  const indentStr = '\n' +
+      ' '.repeat(indent);
+  const content = JSON.stringify(value, null, '  ').replace(/\n/g, indentStr);
+  recorder.insertLeft(start.offset, content);
+}
+
+function updateWorkspaceFileToUseBazelBuilder(options: Schema): Rule {
+  return (host: Tree, context: SchematicContext) => {
+    const {name} = options;
+    const workspacePath = `${name}/angular.json`;
+    if (!host.exists(workspacePath)) {
+      throw new SchematicsException(`Workspace file ${workspacePath} not found.`);
+    }
+    const workspaceBuffer = host.read(workspacePath) !;
+    const workspaceJsonAst = parseJsonAst(workspaceBuffer.toString()) as JsonAstObject;
+    const projects = findPropertyInAstObject(workspaceJsonAst, 'projects');
+    if (!projects) {
+      throw new SchematicsException('Expect projects in angular.json to be an Object');
+    }
+    const project = findPropertyInAstObject(projects as JsonAstObject, name);
+    if (!project) {
+      throw new SchematicsException(`Expected projects to contain ${name}`);
+    }
+    const recorder = host.beginUpdate(workspacePath);
+    const indent = 6;
+    replacePropertyInAstObject(
+        recorder, project as JsonAstObject, 'architect', {
+          'build': {
+            'builder': '@angular/bazel:build',
+            'options': {'targetLabel': '//src:bundle.js', 'bazelCommand': 'build'},
+            'configurations': {'production': {'targetLabel': '//src:bundle'}}
+          },
+          'serve': {
+            'builder': '@angular/bazel:build',
+            'options': {'targetLabel': '//src:devserver', 'bazelCommand': 'run'},
+            'configurations': {'production': {'targetLabel': '//src:prodserver'}}
+          },
+          'extract-i18n': {
+            'builder': '@angular-devkit/build-angular:extract-i18n',
+            'options': {'browserTarget': `${name}:build`}
+          },
+          'test': {
+            'builder': '@angular/bazel:build',
+            'options': {'bazelCommand': 'test', 'targetLabel': '//src/...'}
+          },
+          'lint': {
+            'builder': '@angular-devkit/build-angular:tslint',
+            'options': {
+              'tsConfig': ['src/tsconfig.app.json', 'src/tsconfig.spec.json'],
+              'exclude': ['**/node_modules/**']
+            }
+          }
+        },
+        indent);
+
+    const e2e = `${options.name}-e2e`;
+    const e2eNode = findPropertyInAstObject(projects as JsonAstObject, e2e);
+    if (e2eNode) {
+      replacePropertyInAstObject(
+          recorder, e2eNode as JsonAstObject, 'architect', {
+            'e2e': {
+              'builder': '@angular/bazel:build',
+              'options': {'bazelCommand': 'test', 'targetLabel': '//e2e:devserver_test'},
+              'configurations': {'production': {'targetLabel': '//e2e:prodserver_test'}}
+            },
+            'lint': {
+              'builder': '@angular-devkit/build-angular:tslint',
+              'options': {'tsConfig': 'e2e/tsconfig.e2e.json', 'exclude': ['**/node_modules/**']}
+            }
+          },
+          indent);
+    }
+
+    host.commitUpdate(recorder);
+    return host;
+  };
+}
+
+export default function(options: Schema): Rule {
+  return (host: Tree) => {
+    validateProjectName(options.name);
+
+    return chain([
+      externalSchematic('@schematics/angular', 'ng-new', {
+        ...options,
+        skipInstall: true,
+      }),
+      addDevDependenciesToPackageJson(options),
+      schematic('bazel-workspace', options),
+      overwriteMainAndIndex(options),
+      updateWorkspaceFileToUseBazelBuilder(options),
+    ]);
+  };
+}

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

@@ -0,0 +1,98 @@
+/**
+ * @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 {SchematicTestRunner} from '@angular-devkit/schematics/testing';
+
+describe('Ng-new Schematic', () => {
+  const schematicRunner =
+      new SchematicTestRunner('@angular/bazel', require.resolve('../collection.json'), );
+  const defaultOptions = {
+    name: 'demo',
+    version: '7.0.0',
+  };
+
+  it('should call external @schematics/angular', () => {
+    const options = {...defaultOptions};
+    const host = schematicRunner.runSchematic('ng-new', options);
+    const {files} = host;
+    // External schematic should produce workspace file angular.json
+    expect(files).toContain('/demo/angular.json');
+  });
+
+  it('should add @angular/bazel to package.json dependencies', () => {
+    const options = {...defaultOptions};
+    const host = schematicRunner.runSchematic('ng-new', options);
+    const {files} = host;
+    expect(files).toContain('/demo/package.json');
+    const content = host.readContent('/demo/package.json');
+    expect(() => JSON.parse(content)).not.toThrow();
+    const json = JSON.parse(content);
+    const core = '@angular/core';
+    const bazel = '@angular/bazel';
+    expect(Object.keys(json)).toContain('dependencies');
+    expect(Object.keys(json)).toContain('devDependencies');
+    expect(Object.keys(json.dependencies)).toContain(core);
+    expect(Object.keys(json.devDependencies)).toContain(bazel);
+    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);
+    const {files} = host;
+    expect(files).toContain('/demo/WORKSPACE');
+    expect(files).toContain('/demo/BUILD.bazel');
+  });
+
+  it('should produce main.prod.ts for AOT', () => {
+    const options = {...defaultOptions};
+    const host = schematicRunner.runSchematic('ng-new', options);
+    const {files} = host;
+    // main.prod.ts is used by Bazel for AOT
+    expect(files).toContain('/demo/src/main.prod.ts');
+    // main.ts is produced by original ng-new schematics
+    // This file should be present for backwards compatibility.
+    expect(files).toContain('/demo/src/main.ts');
+  });
+
+  it('should overwrite index.html with script tags', () => {
+    const options = {...defaultOptions};
+    const host = schematicRunner.runSchematic('ng-new', options);
+    const {files} = host;
+    expect(files).toContain('/demo/src/index.html');
+    const content = host.readContent('/demo/src/index.html');
+    expect(content).toMatch('<script src="/zone.min.js"></script>');
+    expect(content).toMatch('<script src="/bundle.min.js"></script>');
+  });
+
+  it('should update angular.json to use Bazel builder', () => {
+    const options = {...defaultOptions};
+    const host = schematicRunner.runSchematic('ng-new', options);
+    const {files} = host;
+    expect(files).toContain('/demo/angular.json');
+    const content = host.readContent('/demo/angular.json');
+    expect(() => JSON.parse(content)).not.toThrow();
+    const json = JSON.parse(content);
+    let {architect} = json.projects.demo;
+    expect(architect.build.builder).toBe('@angular/bazel:build');
+    expect(architect.serve.builder).toBe('@angular/bazel:build');
+    expect(architect.test.builder).toBe('@angular/bazel:build');
+    architect = json.projects['demo-e2e'].architect;
+    expect(architect.e2e.builder).toBe('@angular/bazel:build');
+  });
+});

packages/bazel/src/schematics/ng-new/schema.d.ts

@@ -0,0 +1,103 @@
+
+// THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
+// CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
+
+// tslint:disable:no-global-tslint-disable
+// tslint:disable
+
+export interface Schema {
+  /**
+   * Initial repository commit information.
+   */
+  commit?: CommitUnion;
+  /**
+   * Flag to toggle creation of an application in the new workspace.
+   */
+  createApplication?: boolean;
+  /**
+   * The directory name to create the workspace in.
+   */
+  directory?: string;
+  /**
+   * EXPERIMENTAL: Specifies whether to create a new application which uses the Ivy rendering
+   * engine.
+   */
+  experimentalIvy?: boolean;
+  /**
+   * Specifies if the style will be in the ts file.
+   */
+  inlineStyle?: boolean;
+  /**
+   * Specifies if the template will be in the ts file.
+   */
+  inlineTemplate?: boolean;
+  /**
+   * Link CLI to global version (internal development only).
+   */
+  linkCli?: boolean;
+  /**
+   * Create a barebones project without any testing frameworks
+   */
+  minimal?: boolean;
+  /**
+   * The name of the workspace.
+   */
+  name: string;
+  /**
+   * The path where new projects will be created.
+   */
+  newProjectRoot?: string;
+  /**
+   * The prefix to apply to generated selectors.
+   */
+  prefix?: string;
+  /**
+   * Generates a routing module.
+   */
+  routing?: boolean;
+  /**
+   * Skip initializing a git repository.
+   */
+  skipGit?: boolean;
+  /**
+   * Skip installing dependency packages.
+   */
+  skipInstall?: boolean;
+  /**
+   * Skip creating spec files.
+   */
+  skipTests?: boolean;
+  /**
+   * The file extension to be used for style files.
+   */
+  style?: string;
+  /**
+   * The version of the Angular CLI to use.
+   */
+  version: string;
+  /**
+   * Specifies the view encapsulation strategy.
+   */
+  viewEncapsulation?: ViewEncapsulation;
+}
+
+/**
+ * Initial repository commit information.
+ */
+export type CommitUnion = boolean | CommitObject;
+
+export interface CommitObject {
+  email: string;
+  message?: string;
+  name: string;
+}
+
+/**
+ * Specifies the view encapsulation strategy.
+ */
+export enum ViewEncapsulation {
+  Emulated = 'Emulated',
+  Native = 'Native',
+  None = 'None',
+  ShadowDOM = 'ShadowDom',
+}

packages/bazel/src/schematics/ng-new/schema.json

@@ -0,0 +1,150 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsAngularNgNew",
+  "title": "Angular Ng New Options Schema",
+  "type": "object",
+  "properties": {
+    "directory": {
+      "type": "string",
+      "description": "The directory name to create the workspace in."
+    },
+    "name": {
+      "description": "The name of the workspace.",
+      "type": "string",
+      "format": "html-selector",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the project?"
+    },
+    "experimentalIvy": {
+      "description": "EXPERIMENTAL: Specifies whether to create a new application which uses the Ivy rendering engine.",
+      "type": "boolean",
+      "default": false
+    },
+    "skipInstall": {
+      "description": "Skip installing dependency packages.",
+      "type": "boolean",
+      "default": false
+    },
+    "linkCli": {
+      "description": "Link CLI to global version (internal development only).",
+      "type": "boolean",
+      "default": false,
+      "visible": false
+    },
+    "skipGit": {
+      "description": "Skip initializing a git repository.",
+      "type": "boolean",
+      "default": false,
+      "alias": "g"
+    },
+    "commit": {
+      "description": "Initial repository commit information.",
+      "oneOf": [
+        { "type": "boolean" },
+        {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "email": {
+              "type": "string",
+              "format": "email"
+            },
+            "message": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "name",
+            "email"
+          ]
+        }
+      ],
+      "default": true
+    },
+    "newProjectRoot": {
+      "description": "The path where new projects will be created.",
+      "type": "string",
+      "default": "projects"
+    },
+    "inlineStyle": {
+      "description": "Specifies if the style will be in the ts file.",
+      "type": "boolean",
+      "default": false,
+      "alias": "s"
+    },
+    "inlineTemplate": {
+      "description": "Specifies if the template will be in the ts file.",
+      "type": "boolean",
+      "default": false,
+      "alias": "t"
+    },
+    "viewEncapsulation": {
+      "description": "Specifies the view encapsulation strategy.",
+      "enum": ["Emulated", "Native", "None", "ShadowDom"],
+      "type": "string"
+    },
+    "version": {
+      "type": "string",
+      "description": "The version of the Angular CLI to use.",
+      "visible": false,
+      "$default": {
+        "$source": "ng-cli-version"
+      }
+    },
+    "routing": {
+      "type": "boolean",
+      "description": "Generates a routing module.",
+      "default": false,
+      "x-prompt": "Would you like to add Angular routing?"
+    },
+    "prefix": {
+      "type": "string",
+      "format": "html-selector",
+      "description": "The prefix to apply to generated selectors.",
+      "minLength": 1,
+      "default": "app",
+      "alias": "p"
+    },
+    "style": {
+      "description": "The file extension to be used for style files.",
+      "type": "string",
+      "default": "css",
+      "x-prompt": {
+        "message": "Which stylesheet format would you like to use?",
+        "type": "list",
+        "items": [
+          { "value": "css", "label": "CSS" },
+          { "value": "scss", "label": "SCSS   [ http://sass-lang.com   ]" },
+          { "value": "sass", "label": "SASS   [ http://sass-lang.com   ]" },
+          { "value": "less", "label": "LESS   [ http://lesscss.org     ]" },
+          { "value": "styl", "label": "Stylus [ http://stylus-lang.com ]" }
+        ]
+      }
+    },
+    "skipTests": {
+      "description": "Skip creating spec files.",
+      "type": "boolean",
+      "default": false,
+      "alias": "S"
+    },
+    "createApplication": {
+      "description": "Flag to toggle creation of an application in the new workspace.",
+      "type": "boolean",
+      "default": true
+    },
+    "minimal": {
+      "description": "Create a barebones project without any testing frameworks",
+      "type": "boolean",
+      "default": false
+    }
+  },
+  "required": [
+    "name",
+    "version"
+  ]
+}

packages/bazel/test/ng_package/BUILD.bazel

@@ -12,6 +12,7 @@ ts_library(
     srcs = ["core_package.spec.ts"],
     deps = [
         "//packages:types",
+        "//packages/private/testing",
         "@ngdeps//@types/shelljs",
     ],
 )
@@ -24,9 +25,6 @@ jasmine_node_test(
         "@ngdeps//@types/shelljs",
         "@ngdeps//shelljs",
     ],
-    tags = [
-        "fixme-ivy-aot",
-    ],
 )
 
 ts_library(

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

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {fixmeIvy, ivyEnabled, obsoleteInIvy} from '@angular/private/testing';
 import * as path from 'path';
 import * as shx from 'shelljs';
 
@@ -72,9 +73,9 @@ describe('@angular/core ng_package', () => {
 
 
     describe('typescript support', () => {
-
-      it('should have an index.d.ts file',
+      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'); });
     });
@@ -87,11 +88,12 @@ describe('@angular/core ng_package', () => {
     });
 
 
-    describe('angular metadata', () => {
+    obsoleteInIvy('metadata files are no longer needed or produced in Ivy')
+        .describe('angular metadata', () => {
 
-      it('should have metadata.json files',
-         () => { expect(shx.cat('core.metadata.json')).toContain(`"__symbolic":"module"`); });
-    });
+          it('should have metadata.json files',
+             () => { expect(shx.cat('core.metadata.json')).toContain(`"__symbolic":"module"`); });
+        });
 
 
     describe('fesm2015', () => {
@@ -108,8 +110,10 @@ describe('@angular/core ng_package', () => {
             .toMatch(/@license Angular v\d+\.\d+\.\d+(?!-PLACEHOLDER)/);
       });
 
-      it('should have been built from the generated bundle index',
-         () => { expect(shx.cat('fesm2015/core.js')).toMatch('export {.*makeParamDecorator'); });
+      obsoleteInIvy('we no longer need to export private symbols')
+          .it('should have been built from the generated bundle index', () => {
+            expect(shx.cat('fesm2015/core.js')).toMatch('export {.*makeParamDecorator');
+          });
     });
 
 
@@ -126,16 +130,24 @@ describe('@angular/core ng_package', () => {
         expect(shx.cat('fesm5/core.js')).not.toContain('@fileoverview added by tsickle');
       });
 
-      it('should have decorators',
-         () => { expect(shx.cat('fesm5/core.js')).toContain('__decorate'); });
+      if (ivyEnabled) {
+        it('should have decorators downleveled to static props e.g. ngInjectableDef', () => {
+          expect(shx.cat('fesm5/core.js')).not.toContain('__decorate');
+          expect(shx.cat('fesm5/core.js')).toContain('.ngInjectableDef = ');
+        });
+      } else {
+        it('should have decorators',
+           () => { expect(shx.cat('fesm5/core.js')).toContain('__decorate'); });
+      }
 
       it('should load tslib from external bundle', () => {
         expect(shx.cat('fesm5/core.js')).not.toContain('function __extends');
         expect(shx.cat('fesm5/core.js')).toMatch('import {.*__extends');
       });
 
-      it('should have been built from the generated bundle index',
-         () => { expect(shx.cat('fesm5/core.js')).toMatch('export {.*makeParamDecorator'); });
+      obsoleteInIvy('we no longer need to export private symbols')
+          .it('should have been built from the generated bundle index',
+              () => { expect(shx.cat('fesm5/core.js')).toMatch('export {.*makeParamDecorator'); });
     });
 
 
@@ -212,24 +224,21 @@ describe('@angular/core ng_package', () => {
       const typingsFile = p `testing/index.d.ts`;
       it('should have a typings file',
          () => { expect(shx.cat(typingsFile)).toContain('export * from \'./public_api\';'); });
-    });
-    describe('typescript support', () => {
 
-      // TODO(i): why in the parent dir?
-      it('should have an \'redirect\' d.ts file in the parent dir',
-         () => { expect(shx.cat('testing.d.ts')).toContain(`export *`); });
-
-      it('should have a \'actual\' d.ts file in the parent dir', () => {
-        expect(shx.cat('testing/index.d.ts')).toContain(`export * from './public_api';`);
-      });
+      obsoleteInIvy(
+          'now that we don\'t need metadata files, we don\'t need these redirects to help resolve paths to them')
+          .it('should have an \'redirect\' d.ts file in the parent dir',
+              () => { expect(shx.cat('testing.d.ts')).toContain(`export *`); });
     });
 
-    describe('angular metadata file', () => {
-      it('should have a \'redirect\' metadata.json file next to the d.ts file', () => {
-        expect(shx.cat('testing.metadata.json'))
-            .toContain(`"exports":[{"from":"./testing/testing"}],"flatModuleIndexRedirect":true`);
-      });
-    });
+    obsoleteInIvy('metadata files are no longer needed or produced in Ivy')
+        .describe('angular metadata file', () => {
+          it('should have a \'redirect\' metadata.json file next to the d.ts file', () => {
+            expect(shx.cat('testing.metadata.json'))
+                .toContain(
+                    `"exports":[{"from":"./testing/testing"}],"flatModuleIndexRedirect":true`);
+          });
+        });
 
     describe('fesm2015', () => {
       it('should have a fesm15 file in the /fesm2015 directory',

packages/bazel/test/ngc-wrapped/BUILD.bazel

@@ -31,7 +31,7 @@ jasmine_node_test(
         ":angular_core",
         "//packages/bazel/test/ngc-wrapped/empty:empty_tsconfig.json",
         "//packages/bazel/test/ngc-wrapped/empty:tsconfig.json",
+        "//packages/private/testing",
         "@build_bazel_rules_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
     ],
-    tags = ["fixme-ivy-aot"],
 )

packages/bazel/test/ngc-wrapped/empty/BUILD.bazel

@@ -5,7 +5,6 @@ package(default_visibility = ["//packages/bazel/test:__subpackages__"])
 ng_module(
     name = "empty",
     srcs = ["empty.ts"],
-    tags = ["fixme-ivy-aot"],
     tsconfig = ":tsconfig.json",
     deps = [
         "//packages/core",

packages/bazel/test/ngc-wrapped/empty/tsconfig.json

@@ -2,6 +2,7 @@
   "compilerOptions": {
     "paths": {
       "@angular/core": ["../../../../dist/packages/core"]
-    }
+    },
+    "skipLibCheck": true
   }
 }

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

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as fs from 'fs';
 import * as path from 'path';
 
 import {setup} from './test_support';

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

@@ -55,6 +55,7 @@ export function createTsConfig(options: TsConfigOptions) {
       // declaration in the same tsconfig.json, otherwise ts will error.
       'declaration': true,
       'declarationDir': options.outDir,
+      'skipLibCheck': true,
     },
     'bazelOptions': {
       ...result.bazelOptions,

packages/bazel/yarn.lock

@@ -372,6 +372,11 @@ detect-libc@^1.0.2:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
+diff@^3.2.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -725,6 +730,13 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
+jasmine-diff@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8"
+  integrity sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=
+  dependencies:
+    diff "^3.2.0"
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -1254,7 +1266,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.9:
+source-map-support@0.5.9, source-map-support@^0.5.0:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
   integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
@@ -1267,7 +1279,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@0.7.3, source-map@^0.7.3:
+source-map@0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -1378,14 +1390,16 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tsickle@0.34.0:
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.34.0.tgz#10187fa6401a288a65efb93a60bf28b2ff95f90b"
-  integrity sha512-O3wCPRtL18Hc/ZBnaiKwmmjVzeCWTOTpsi0btfC7FWL3RnXpxLPxD6hoJ0QEXuSfG/0QJk+MWNjqT9N6fOyyIg==
+tsickle@0.32.1:
+  version "0.32.1"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5"
+  integrity sha512-JW9j+W0SaMSZGejIFZBk0AiPfnhljK3oLx5SaqxrJhjlvzFyPml5zqG1/PuScUj6yTe1muEqwk5CnDK0cOZmKw==
   dependencies:
+    jasmine-diff "^0.1.3"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
-    source-map "^0.7.3"
+    source-map "^0.6.0"
+    source-map-support "^0.5.0"
 
 tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"

packages/common/http/src/xhr.ts

@@ -232,10 +232,12 @@ export class HttpXhrBackend implements HttpBackend {
       // Connection timeout, DNS error, offline, etc. These are actual errors, and are
       // transmitted on the error channel.
       const onError = (error: ErrorEvent) => {
+        const {url} = partialFromXhr();
         const res = new HttpErrorResponse({
           error,
           status: xhr.status || 0,
           statusText: xhr.statusText || 'Unknown Error',
+          url: url || undefined,
         });
         observer.error(res);
       };

packages/common/http/test/xhr_spec.ts

@@ -142,6 +142,7 @@ const XSSI_PREFIX = ')]}\'\n';
       backend.handle(TEST_POST).subscribe(undefined, (err: HttpErrorResponse) => {
         expect(err instanceof HttpErrorResponse).toBe(true);
         expect(err.error instanceof Error);
+        expect(err.url).toBe('/test');
         done();
       });
       factory.mock.mockErrorEvent(new Error('blah'));

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', () => {
 
@@ -91,35 +91,37 @@ describe('insert/remove', () => {
        expect(fixture.nativeElement).toHaveText('bar');
      }));
 
-  fixmeIvy('FW-642: ASSERTION ERROR: Slot should have been initialized to NO_CHANGE') &&
-      it('should use the injector, if one supplied', async(() => {
-           let fixture = TestBed.createComponent(TestComponent);
-
-           const uniqueValue = {};
-           fixture.componentInstance.currentComponent = InjectedComponent;
-           fixture.componentInstance.injector = Injector.create(
-               [{provide: TEST_TOKEN, useValue: uniqueValue}], fixture.componentRef.injector);
-
-           fixture.detectChanges();
-           let cmpRef: ComponentRef<InjectedComponent> = fixture.componentInstance.cmpRef !;
-           expect(cmpRef).toBeAnInstanceOf(ComponentRef);
-           expect(cmpRef.instance).toBeAnInstanceOf(InjectedComponent);
-           expect(cmpRef.instance.testToken).toBe(uniqueValue);
-
-         }));
-
-  it('should resolve a with injector', async(() => {
+  it('should use the injector, if one supplied', async(() => {
        let fixture = TestBed.createComponent(TestComponent);
 
-       fixture.componentInstance.cmpRef = null;
+       const uniqueValue = {};
        fixture.componentInstance.currentComponent = InjectedComponent;
+       fixture.componentInstance.injector = Injector.create(
+           [{provide: TEST_TOKEN, useValue: uniqueValue}], fixture.componentRef.injector);
+
        fixture.detectChanges();
        let cmpRef: ComponentRef<InjectedComponent> = fixture.componentInstance.cmpRef !;
        expect(cmpRef).toBeAnInstanceOf(ComponentRef);
        expect(cmpRef.instance).toBeAnInstanceOf(InjectedComponent);
-       expect(cmpRef.instance.testToken).toBeNull();
+       expect(cmpRef.instance.testToken).toBe(uniqueValue);
+
      }));
 
+
+  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}`;
        TestBed.overrideComponent(TestComponent, {set: {template: template}})
@@ -144,72 +146,68 @@ describe('insert/remove', () => {
        expect(fixture.nativeElement).toHaveText('projected foo');
      }));
 
-  fixmeIvy('FW-561: Runtime compiler is not loaded') &&
-      it('should resolve components from other modules, if supplied', async(() => {
-           const compiler = TestBed.get(Compiler) as Compiler;
-           let fixture = TestBed.createComponent(TestComponent);
+  it('should resolve components from other modules, if supplied', async(() => {
+       const compiler = TestBed.get(Compiler) as Compiler;
+       let fixture = TestBed.createComponent(TestComponent);
 
-           fixture.detectChanges();
-           expect(fixture.nativeElement).toHaveText('');
+       fixture.detectChanges();
+       expect(fixture.nativeElement).toHaveText('');
 
-           fixture.componentInstance.module = compiler.compileModuleSync(TestModule2);
-           fixture.componentInstance.currentComponent = Module2InjectedComponent;
+       fixture.componentInstance.module = compiler.compileModuleSync(TestModule2);
+       fixture.componentInstance.currentComponent = Module2InjectedComponent;
 
-           fixture.detectChanges();
-           expect(fixture.nativeElement).toHaveText('baz');
-         }));
+       fixture.detectChanges();
+       expect(fixture.nativeElement).toHaveText('baz');
+     }));
 
-  fixmeIvy('FW-561: Runtime compiler is not loaded') &&
-      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();
+     }));
 
-  fixmeIvy('FW-561: Runtime compiler is not loaded') &&
-      it('should not re-create moduleRef when it didn\'t actually change', async(() => {
-           const compiler = TestBed.get(Compiler) as Compiler;
-           const fixture = TestBed.createComponent(TestComponent);
+  it('should not re-create moduleRef when it didn\'t actually change', async(() => {
+       const compiler = TestBed.get(Compiler) as Compiler;
+       const fixture = TestBed.createComponent(TestComponent);
 
-           fixture.componentInstance.module = compiler.compileModuleSync(TestModule2);
-           fixture.componentInstance.currentComponent = Module2InjectedComponent;
-           fixture.detectChanges();
-           expect(fixture.nativeElement).toHaveText('baz');
-           const moduleRef = fixture.componentInstance.ngComponentOutlet['_moduleRef'];
+       fixture.componentInstance.module = compiler.compileModuleSync(TestModule2);
+       fixture.componentInstance.currentComponent = Module2InjectedComponent;
+       fixture.detectChanges();
+       expect(fixture.nativeElement).toHaveText('baz');
+       const moduleRef = fixture.componentInstance.ngComponentOutlet['_moduleRef'];
 
-           fixture.componentInstance.currentComponent = Module2InjectedComponent2;
-           fixture.detectChanges();
+       fixture.componentInstance.currentComponent = Module2InjectedComponent2;
+       fixture.detectChanges();
 
-           expect(fixture.nativeElement).toHaveText('baz2');
-           expect(moduleRef).toBe(fixture.componentInstance.ngComponentOutlet['_moduleRef']);
-         }));
+       expect(fixture.nativeElement).toHaveText('baz2');
+       expect(moduleRef).toBe(fixture.componentInstance.ngComponentOutlet['_moduleRef']);
+     }));
 
-  fixmeIvy('FW-561: Runtime compiler is not loaded') &&
-      it('should re-create moduleRef when changed', async(() => {
-           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 re-create moduleRef when changed', async(() => {
+       const compiler = TestBed.get(Compiler) as Compiler;
+       const fixture = TestBed.createComponent(TestComponent);
+       fixture.componentInstance.module = compiler.compileModuleSync(TestModule2);
+       fixture.componentInstance.currentComponent = Module2InjectedComponent;
+       fixture.detectChanges();
 
-           expect(fixture.nativeElement).toHaveText('baz');
+       expect(fixture.nativeElement).toHaveText('baz');
 
-           fixture.componentInstance.module = compiler.compileModuleSync(TestModule3);
-           fixture.componentInstance.currentComponent = Module3InjectedComponent;
-           fixture.detectChanges();
+       fixture.componentInstance.module = compiler.compileModuleSync(TestModule3);
+       fixture.componentInstance.currentComponent = Module3InjectedComponent;
+       fixture.detectChanges();
 
-           expect(fixture.nativeElement).toHaveText('bat');
-         }));
+       expect(fixture.nativeElement).toHaveText('bat');
+     }));
 });
 
 const TEST_TOKEN = new InjectionToken('TestToken');

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,9 +10,6 @@ ts_library(
             "**/*.ts",
         ],
     ),
-    tags = [
-        "fixme-ivy-aot",
-    ],
     deps = [
         "//packages/compiler-cli/integrationtest/bazel/injectable_def/app",
         "//packages/core",
@@ -25,13 +22,11 @@ ts_library(
 jasmine_node_test(
     name = "test",
     bootstrap = ["angular/tools/testing/init_node_spec.js"],
-    tags = [
-        "fixme-ivy-aot",
-    ],
     deps = [
         ":test_lib",
         "//packages/platform-server",
         "//packages/platform-server/testing",
+        "//packages/private/testing",
         "//tools/testing:node",
     ],
 )

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

@@ -9,6 +9,7 @@
 import {Component, INJECTOR, Injectable, NgModule} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {renderModuleFactory} from '@angular/platform-server';
+import {fixmeIvy} from '@angular/private/testing';
 import {BasicAppModuleNgFactory} from 'app_built/src/basic.ngfactory';
 import {DepAppModuleNgFactory} from 'app_built/src/dep.ngfactory';
 import {HierarchyAppModuleNgFactory} from 'app_built/src/hierarchy.ngfactory';
@@ -167,20 +168,21 @@ describe('ngInjectableDef Bazel Integration', () => {
     expect(TestBed.get(INJECTOR).get('foo')).toEqual('bar');
   });
 
-  it('Component injector understands requests for INJECTABLE', () => {
-    @Component({
-      selector: 'test-cmp',
-      template: 'test',
-      providers: [{provide: 'foo', useValue: 'bar'}],
-    })
-    class TestCmp {
-    }
+  fixmeIvy('FW-854: NodeInjector does not know how to get itself (INJECTOR)')
+      .it('Component injector understands requests for INJECTABLE', () => {
+        @Component({
+          selector: 'test-cmp',
+          template: 'test',
+          providers: [{provide: 'foo', useValue: 'bar'}],
+        })
+        class TestCmp {
+        }
 
-    TestBed.configureTestingModule({
-      declarations: [TestCmp],
-    });
+        TestBed.configureTestingModule({
+          declarations: [TestCmp],
+        });
 
-    const fixture = TestBed.createComponent(TestCmp);
-    expect(fixture.componentRef.injector.get(INJECTOR).get('foo')).toEqual('bar');
-  });
+        const fixture = TestBed.createComponent(TestCmp);
+        expect(fixture.componentRef.injector.get(INJECTOR).get('foo')).toEqual('bar');
+      });
 });

packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel

@@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ivy_ng_module")
+load("//tools:defaults.bzl", "ng_module")
 load("//packages/bazel/src:ng_rollup_bundle.bzl", "ng_rollup_bundle")
 
-ivy_ng_module(
+ng_module(
     name = "app",
     srcs = glob(
         [
@@ -11,6 +11,7 @@ ivy_ng_module(
         ],
     ),
     module_name = "app_built",
+    tags = ["ivy-only"],
     deps = [
         "//packages/core",
         "@rxjs",

packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel

@@ -10,9 +10,13 @@ ts_library(
             "**/*.ts",
         ],
     ),
+    tags = [
+        "ivy-only",
+    ],
     deps = [
         "//packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app",
         "//packages/core",
+        "//packages/private/testing",
     ],
 )
 
@@ -20,7 +24,7 @@ jasmine_node_test(
     name = "test",
     bootstrap = ["angular/tools/testing/init_node_spec.js"],
     tags = [
-        "fixme-ivy-aot",
+        "ivy-only",
     ],
     deps = [
         ":test_lib",

packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/module_spec.ts

@@ -82,4 +82,4 @@ describe('Ivy NgModule', () => {
       expect(injector.get(TOKEN)).toEqual('provided from B');
     });
   });
-});
+});

packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel

@@ -11,7 +11,9 @@ ng_module(
     ng_xi18n = "//packages/bazel/src/ngc-wrapped:xi18n",
     node_modules = "@ngdeps//typescript:typescript__typings",
     tags = [
-        "fixme-ivy-aot",
+        # Disabled as this test is specific to the flat module indexing of metadata.json files that
+        # the old ngc compiler does. Ivy has no metadata.json files so this test does not apply.
+        "no-ivy-aot",
     ],
     deps = [
         "//packages/core",
@@ -34,6 +36,8 @@ jasmine_node_test(
     srcs = ["spec.js"],
     data = [":flat_module_index"],
     tags = [
-        "fixme-ivy-aot",
+        # Disabled as this test is specific to the flat module indexing of metadata.json files that
+        # the old ngc compiler does. Ivy has no metadata.json files so this test does not apply.
+        "no-ivy-aot",
     ],
 )

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/decoration_analyzer.ts

@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {ConstantPool} from '@angular/compiler';
+import * as path from 'canonical-path';
 import * as fs from 'fs';
 import * as ts from 'typescript';
 
-import {BaseDefDecoratorHandler, ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecoratorHandler, NgModuleDecoratorHandler, PipeDecoratorHandler, ResourceLoader, SelectorScopeRegistry} from '../../../ngtsc/annotations';
+import {BaseDefDecoratorHandler, ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecoratorHandler, NgModuleDecoratorHandler, PipeDecoratorHandler, ReferencesRegistry, ResourceLoader, SelectorScopeRegistry} from '../../../ngtsc/annotations';
 import {CompileResult, DecoratorHandler} from '../../../ngtsc/transform';
-
 import {DecoratedClass} from '../host/decorated_class';
 import {NgccReflectionHost} from '../host/ngcc_host';
 import {isDefined} from '../utils';
@@ -47,7 +47,10 @@ export interface MatchingHandler<A, M> {
  * `ResourceLoader` which directly uses the filesystem to resolve resources synchronously.
  */
 export class FileResourceLoader implements ResourceLoader {
-  load(url: string): string { return fs.readFileSync(url, 'utf8'); }
+  load(url: string, containingFile: string): string {
+    url = path.resolve(path.dirname(containingFile), url);
+    return fs.readFileSync(url, 'utf8');
+  }
 }
 
 /**
@@ -60,16 +63,18 @@ export class DecorationAnalyzer {
     new BaseDefDecoratorHandler(this.typeChecker, this.host),
     new ComponentDecoratorHandler(
         this.typeChecker, this.host, this.scopeRegistry, this.isCore, this.resourceLoader,
-        this.rootDirs),
+        this.rootDirs, /* defaultPreserveWhitespaces */ false, /* i18nUseExternalIds */ true),
     new DirectiveDecoratorHandler(this.typeChecker, this.host, this.scopeRegistry, this.isCore),
     new InjectableDecoratorHandler(this.host, this.isCore),
-    new NgModuleDecoratorHandler(this.typeChecker, this.host, this.scopeRegistry, this.isCore),
+    new NgModuleDecoratorHandler(
+        this.typeChecker, this.host, this.scopeRegistry, this.referencesRegistry, this.isCore),
     new PipeDecoratorHandler(this.typeChecker, this.host, this.scopeRegistry, this.isCore),
   ];
 
   constructor(
       private typeChecker: ts.TypeChecker, private host: NgccReflectionHost,
-      private rootDirs: string[], private isCore: boolean) {}
+      private referencesRegistry: ReferencesRegistry, private rootDirs: string[],
+      private isCore: boolean) {}
 
   /**
    * Analyze a program to find all the decorated files should be transformed.

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/ngcc_references_registry.ts

@@ -0,0 +1,49 @@
+/**
+ * @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, ReflectionHost} from '../../../ngtsc/host';
+import {Reference, ResolvedReference} from '../../../ngtsc/metadata';
+import {hasNameIdentifier} from '../utils';
+
+/**
+ * This is a place for DecoratorHandlers to register references that they
+ * find in their analysis of the code.
+ *
+ * This registry is used to ensure that these references are publicly exported
+ * from libraries that are compiled by ngcc.
+ */
+export class NgccReferencesRegistry implements ReferencesRegistry {
+  private map = new Map<ts.Identifier, Declaration>();
+
+  constructor(private host: ReflectionHost) {}
+
+  /**
+   * Register one or more references in the registry.
+   * Only `ResolveReference` references are stored. Other types are ignored.
+   * @param references A collection of references to register.
+   */
+  add(...references: Reference<ts.Declaration>[]): void {
+    references.forEach(ref => {
+      // Only store resolved references. We are not interested in literals.
+      if (ref instanceof ResolvedReference && hasNameIdentifier(ref.node)) {
+        const declaration = this.host.getDeclarationOfIdentifier(ref.node.name);
+        if (declaration && hasNameIdentifier(declaration.node)) {
+          this.map.set(declaration.node.name, declaration);
+        }
+      }
+    });
+  }
+
+  /**
+   * Create and return a mapping for the registered resolved references.
+   * @returns A map of reference identifiers to reference declarations.
+   */
+  getDeclarationMap(): Map<ts.Identifier, Declaration> { return this.map; }
+}

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

@@ -0,0 +1,60 @@
+/**
+ * @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 {NgccReflectionHost} from '../host/ngcc_host';
+import {hasNameIdentifier, isDefined} from '../utils';
+
+export interface ExportInfo {
+  identifier: string;
+  from: string;
+  dtsFrom?: string|null;
+}
+export type PrivateDeclarationsAnalyses = ExportInfo[];
+
+/**
+ * This class will analyze a program to find all the declared classes
+ * (i.e. on an NgModule) that are not publicly exported via an entry-point.
+ */
+export class PrivateDeclarationsAnalyzer {
+  constructor(private host: NgccReflectionHost, private referencesRegistry: ReferencesRegistry) {}
+
+  analyzeProgram(program: ts.Program): PrivateDeclarationsAnalyses {
+    const rootFiles = this.getRootFiles(program);
+    return this.getPrivateDeclarations(rootFiles, this.referencesRegistry.getDeclarationMap());
+  }
+
+  private getRootFiles(program: ts.Program): ts.SourceFile[] {
+    return program.getRootFileNames().map(f => program.getSourceFile(f)).filter(isDefined);
+  }
+
+  private getPrivateDeclarations(
+      rootFiles: ts.SourceFile[],
+      declarations: Map<ts.Identifier, Declaration>): PrivateDeclarationsAnalyses {
+    const privateDeclarations: Map<ts.Identifier, Declaration> = new Map(declarations);
+    rootFiles.forEach(f => {
+      const exports = this.host.getExportsOfModule(f);
+      if (exports) {
+        exports.forEach((declaration, exportedName) => {
+          if (hasNameIdentifier(declaration.node) && declaration.node.name.text === exportedName) {
+            privateDeclarations.delete(declaration.node.name);
+          }
+        });
+      }
+    });
+    return Array.from(privateDeclarations.keys()).map(id => {
+      const from = id.getSourceFile().fileName;
+      const declaration = privateDeclarations.get(id) !;
+      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

@@ -10,10 +10,11 @@ import * as ts from 'typescript';
 
 import {ClassMember, ClassMemberKind, CtorParameter, Decorator, Import} from '../../../ngtsc/host';
 import {TypeScriptReflectionHost, reflectObjectLiteral} from '../../../ngtsc/metadata';
-import {findAll, getNameText, getOriginalSymbol, isDefined} from '../utils';
+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;
@@ -48,14 +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;
-  constructor(
-      protected isCore: boolean, checker: ts.TypeChecker, dtsRootFileName?: string,
-      dtsProgram?: ts.Program|null) {
+  protected dtsDeclarationMap: Map<string, ts.Declaration>|null;
+  constructor(protected isCore: boolean, checker: ts.TypeChecker, dts?: BundleProgram|null) {
     super(checker);
-    this.dtsClassMap = (dtsRootFileName && dtsProgram) ?
-        this.computeDtsClassMap(dtsRootFileName, dtsProgram) :
-        null;
+    this.dtsDeclarationMap = dts && this.computeDtsDeclarationMap(dts.path, dts.program) || null;
   }
 
   /**
@@ -330,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
@@ -349,24 +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}`);
-        }
-        const dtsDeclaration = this.dtsClassMap.get(declaration.name.text);
-        if (!dtsDeclaration) {
-          throw new Error(
-              `Unable to find matching typings (.d.ts) declaration for ${declaration.name.text} in ${declaration.getSourceFile().fileName}`);
-        }
-        return dtsDeclaration;
-      }
+  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 /////////////
 
@@ -746,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 {
@@ -805,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};
     });
   }
 
@@ -840,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};
             });
       }
     }
@@ -853,8 +874,8 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
   }
 
   /**
-   * Get the parmeter 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.
@@ -865,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} =
@@ -879,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':
@@ -978,7 +1000,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
    * Test whether a decorator was imported from `@angular/core`.
    *
    * Is the decorator:
-   * * externally imported from `@angulare/core`?
+   * * externally imported from `@angular/core`?
    * * the current hosted program is actually `@angular/core` and
    *   - relatively internally imported; or
    *   - not imported, from the current file.
@@ -993,32 +1015,63 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
     }
   }
 
-  protected computeDtsClassMap(dtsRootFileName: string, dtsProgram: ts.Program):
-      Map<string, ts.ClassDeclaration> {
-    const dtsClassMap = new Map<string, ts.ClassDeclaration>();
+  /**
+   * Extract all the class declarations from the dtsTypings program, storing them in a map
+   * where the key is the declared name of the class and the value is the declaration itself.
+   *
+   * It is possible for there to be multiple class declarations with the same local name.
+   * Only the first declaration with a given name is added to the map; subsequent classes will be
+   * ignored.
+   *
+   * We are most interested in classes that are publicly exported from the entry point, so these are
+   * added to the map first, to ensure that they are not ignored.
+   *
+   * @param dtsRootFileName The filename of the entry-point to the `dtsTypings` program.
+   * @param dtsProgram The program containing all the typings files.
+   * @returns a map of class names to class declarations.
+   */
+  protected computeDtsDeclarationMap(dtsRootFileName: string, dtsProgram: ts.Program):
+      Map<string, ts.Declaration> {
+    const dtsDeclarationMap = new Map<string, ts.Declaration>();
     const checker = dtsProgram.getTypeChecker();
-    const dtsRootFile = dtsProgram.getSourceFile(dtsRootFileName);
-    const rootModule = dtsRootFile && checker.getSymbolAtLocation(dtsRootFile);
-    const moduleExports = rootModule && checker.getExportsOfModule(rootModule);
-    if (moduleExports) {
-      moduleExports.forEach(exportedSymbol => {
-        if (exportedSymbol.flags & ts.SymbolFlags.Alias) {
-          exportedSymbol = checker.getAliasedSymbol(exportedSymbol);
-        }
-        const declaration = exportedSymbol.declarations[0];
-        if (declaration && ts.isClassDeclaration(declaration)) {
-          const name = exportedSymbol.name;
-          const previousDeclaration = dtsClassMap.get(name);
-          if (previousDeclaration && previousDeclaration !== declaration) {
-            console.warn(
-                `Ambiguous class name ${name} in typings files: ${previousDeclaration.getSourceFile().fileName} and ${declaration.getSourceFile().fileName}`);
-          } else {
-            dtsClassMap.set(name, declaration);
-          }
-        }
-      });
+
+    // First add all the classes that are publicly exported from the entry-point
+    const rootFile = dtsProgram.getSourceFile(dtsRootFileName);
+    if (!rootFile) {
+      throw new Error(`The given file ${dtsRootFileName} is not part of the typings program.`);
     }
-    return dtsClassMap;
+    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 => { 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};
   }
 }
 
@@ -1026,7 +1079,7 @@ export class Esm2015ReflectionHost extends TypeScriptReflectionHost implements N
 
 export type ParamInfo = {
   decorators: Decorator[] | null,
-  type: ts.Expression | null
+  typeExpression: ts.Expression | null
 };
 
 /**
@@ -1129,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,3 +1206,26 @@ function getFarLeftIdentifier(propertyAccess: ts.PropertyAccessExpression): ts.I
   }
   return ts.isIdentifier(propertyAccess.expression) ? propertyAccess.expression : null;
 }
+
+/**
+ * Collect mappings between exported declarations in a source file and its associated
+ * declaration in the typings program.
+ */
+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);
+  if (moduleExports) {
+    moduleExports.forEach(exportedSymbol => {
+      if (exportedSymbol.flags & ts.SymbolFlags.Alias) {
+        exportedSymbol = checker.getAliasedSymbol(exportedSymbol);
+      }
+      const declaration = exportedSymbol.valueDeclaration;
+      const name = exportedSymbol.name;
+      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,9 +8,11 @@
 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';
+import {makeEntryPointBundle} from './packages/entry_point_bundle';
 import {EntryPointFinder} from './packages/entry_point_finder';
 import {Transformer} from './packages/transformer';
 
@@ -48,12 +50,33 @@ export function mainNgcc(args: string[]): number {
   try {
     const {entryPoints} = finder.findEntryPoints(sourcePath);
     entryPoints.forEach(entryPoint => {
+
+      // Are we compiling the Angular core?
+      const isCore = entryPoint.name === '@angular/core';
+
       // We transform the d.ts typings files while transforming one of the formats.
       // This variable decides with which of the available formats to do this transform.
       // It is marginally faster to process via the flat file if available.
-      const dtsTranformFormat: EntryPointFormat = entryPoint.fesm2015 ? 'fesm2015' : 'esm2015';
-      formats.forEach(
-          format => transformer.transform(entryPoint, format, format === dtsTranformFormat));
+      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) {
+          console.warn(
+              `Skipping ${entryPoint.name} : ${format} (no entry point file for this format).`);
+        } else {
+          transformer.transform(entryPoint, isCore, bundle);
+        }
+
+        // Write the built-with-ngcc marker
+        writeMarkerFile(entryPoint, format);
+      });
     });
   } catch (e) {
     console.error(e.stack);

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

@@ -1,31 +0,0 @@
-/**
- * @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';
-
-/**
- * A bundle represents the currently compiled entry point format, containing
- * information that is necessary for compiling @angular/core with ngcc.
- */
-export interface BundleInfo {
-  isCore: boolean;
-  isFlat: boolean;
-  rewriteCoreImportsTo: ts.SourceFile|null;
-  rewriteCoreDtsImportsTo: ts.SourceFile|null;
-}
-
-export function createBundleInfo(
-    isCore: boolean, rewriteCoreImportsTo: ts.SourceFile | null,
-    rewriteCoreDtsImportsTo: ts.SourceFile | null): BundleInfo {
-  return {
-    isCore,
-    isFlat: rewriteCoreImportsTo === null,
-    rewriteCoreImportsTo: rewriteCoreImportsTo,
-    rewriteCoreDtsImportsTo: rewriteCoreDtsImportsTo,
-  };
-}

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

@@ -0,0 +1,72 @@
+/**
+ * @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 {dirname, resolve} from 'canonical-path';
+import {existsSync, lstatSync, readdirSync} from 'fs';
+import * as ts from 'typescript';
+
+/**
+* An entry point bundle contains one or two programs, e.g. `src` and `dts`,
+* that are compiled via TypeScript.
+*
+* To aid with processing the program, this interface exposes the program itself,
+* as well as path and TS file of the entry-point to the program and the r3Symbols
+* file, if appropriate.
+*/
+export interface BundleProgram {
+  program: ts.Program;
+  path: string;
+  file: ts.SourceFile;
+  r3SymbolsPath: string|null;
+  r3SymbolsFile: ts.SourceFile|null;
+}
+
+/**
+ * Create a bundle program.
+ */
+export function makeBundleProgram(
+    isCore: boolean, path: string, r3FileName: string, options: ts.CompilerOptions,
+    host: ts.CompilerHost): BundleProgram {
+  const r3SymbolsPath = isCore ? findR3SymbolsPath(dirname(path), r3FileName) : null;
+  const rootPaths = r3SymbolsPath ? [path, r3SymbolsPath] : [path];
+  const program = ts.createProgram(rootPaths, options, host);
+  const file = program.getSourceFile(path) !;
+  const r3SymbolsFile = r3SymbolsPath && program.getSourceFile(r3SymbolsPath) || null;
+
+  return {program, path, file, r3SymbolsPath, r3SymbolsFile};
+}
+
+/**
+ * Search the given directory hierarchy to find the path to the `r3_symbols` file.
+ */
+export function findR3SymbolsPath(directory: string, filename: string): string|null {
+  const r3SymbolsFilePath = resolve(directory, filename);
+  if (existsSync(r3SymbolsFilePath)) {
+    return r3SymbolsFilePath;
+  }
+
+  const subDirectories =
+      readdirSync(directory)
+          // Not interested in hidden files
+          .filter(p => !p.startsWith('.'))
+          // Ignore node_modules
+          .filter(p => p !== 'node_modules')
+          // Only interested in directories (and only those that are not symlinks)
+          .filter(p => {
+            const stat = lstatSync(resolve(directory, p));
+            return stat.isDirectory() && !stat.isSymbolicLink();
+          });
+
+  for (const subDirectory of subDirectories) {
+    const r3SymbolsFilePath = findR3SymbolsPath(resolve(directory, subDirectory, ), filename);
+    if (r3SymbolsFilePath) {
+      return r3SymbolsFilePath;
+    }
+  }
+
+  return null;
+}

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

@@ -28,7 +28,7 @@ export class DependencyHost {
       from: string, resolved: Set<string>, missing: Set<string>, deepImports: Set<string>,
       internal: Set<string> = new Set()): void {
     const fromContents = fs.readFileSync(from, 'utf8');
-    if (!this.hasImportOrReeportStatements(fromContents)) {
+    if (!this.hasImportOrReexportStatements(fromContents)) {
       return;
     }
 
@@ -142,7 +142,7 @@ export class DependencyHost {
    * @returns false if there are definitely no import or re-export statements
    * in this file, true otherwise.
    */
-  hasImportOrReeportStatements(source: string): boolean {
+  hasImportOrReexportStatements(source: string): boolean {
     return /(import|export)\s.+from/.test(source);
   }
 }

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

@@ -10,23 +10,27 @@ import * as path from 'canonical-path';
 import * as fs from 'fs';
 
 
-/**
- * The possible values for the format of an entry-point.
- */
-export type EntryPointFormat = 'esm5' | 'fesm5' | 'esm2015' | 'fesm2015' | 'umd';
-
 /**
  * An object containing paths to the entry-points for each format.
  */
-export type EntryPointPaths = {
-  [Format in EntryPointFormat]?: string;
-};
+export interface EntryPointPaths {
+  esm5?: string;
+  fesm5?: string;
+  esm2015?: string;
+  fesm2015?: string;
+  umd?: string;
+}
+
+/**
+ * The possible values for the format of an entry-point.
+ */
+export type EntryPointFormat = keyof(EntryPointPaths);
 
 /**
  * An object containing information about an entry-point, including paths
  * to each of the possible entry-point formats.
  */
-export type EntryPoint = EntryPointPaths & {
+export interface EntryPoint extends EntryPointPaths {
   /** The name of the package (e.g. `@angular/core`). */
   name: string;
   /** The path to the package that contains this entry-point. */
@@ -35,8 +39,11 @@ export type EntryPoint = EntryPointPaths & {
   path: string;
   /** The path to a typings (.d.ts) file for this entry-point. */
   typings: string;
-};
+}
 
+/**
+ * The properties that may be loaded from the `package.json` file.
+ */
 interface EntryPointPackageJson {
   name: string;
   fesm2015?: string;
@@ -55,7 +62,7 @@ interface EntryPointPackageJson {
  * @param packageJsonPath the absolute path to the package.json file.
  * @returns JSON from the package.json file if it is valid, `null` otherwise.
  */
-function loadEntryPointPackage(packageJsonPath: string): {[key: string]: any}|null {
+function loadEntryPointPackage(packageJsonPath: string): EntryPointPackageJson|null {
   try {
     return JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
   } catch (e) {
@@ -66,13 +73,13 @@ function loadEntryPointPackage(packageJsonPath: string): {[key: string]: any}|nu
 }
 
 /**
- * Try to get entry point info from the given path.
- * @param pkgPath the absolute path to the containing npm package
- * @param entryPoint the absolute path to the potential entry point.
+ * Try to get an entry point from the given path.
+ * @param packagePath the absolute path to the containing npm package
+ * @param entryPointPath the absolute path to the potential entry point.
  * @returns Info about the entry point if it is valid, `null` otherwise.
  */
-export function getEntryPointInfo(pkgPath: string, entryPoint: string): EntryPoint|null {
-  const packageJsonPath = path.resolve(entryPoint, 'package.json');
+export function getEntryPointInfo(packagePath: string, entryPointPath: string): EntryPoint|null {
+  const packageJsonPath = path.resolve(entryPointPath, 'package.json');
   if (!fs.existsSync(packageJsonPath)) {
     return null;
   }
@@ -101,33 +108,34 @@ export function getEntryPointInfo(pkgPath: string, entryPoint: string): EntryPoi
     return null;
   }
 
-  // Also we need to have a metadata.json file
-  const metadataPath = path.resolve(entryPoint, typings.replace(/\.d\.ts$/, '') + '.metadata.json');
+  // Also there must exist a `metadata.json` file next to the typings entry-point.
+  const metadataPath =
+      path.resolve(entryPointPath, typings.replace(/\.d\.ts$/, '') + '.metadata.json');
   if (!fs.existsSync(metadataPath)) {
     return null;
   }
 
   const entryPointInfo: EntryPoint = {
     name,
-    package: pkgPath,
-    path: entryPoint,
-    typings: path.resolve(entryPoint, typings),
+    package: packagePath,
+    path: entryPointPath,
+    typings: path.resolve(entryPointPath, typings),
   };
 
   if (esm2015) {
-    entryPointInfo.esm2015 = path.resolve(entryPoint, esm2015);
+    entryPointInfo.esm2015 = path.resolve(entryPointPath, esm2015);
   }
   if (fesm2015) {
-    entryPointInfo.fesm2015 = path.resolve(entryPoint, fesm2015);
+    entryPointInfo.fesm2015 = path.resolve(entryPointPath, fesm2015);
   }
   if (fesm5) {
-    entryPointInfo.fesm5 = path.resolve(entryPoint, fesm5);
+    entryPointInfo.fesm5 = path.resolve(entryPointPath, fesm5);
   }
   if (esm5) {
-    entryPointInfo.esm5 = path.resolve(entryPoint, esm5);
+    entryPointInfo.esm5 = path.resolve(entryPointPath, esm5);
   }
   if (main) {
-    entryPointInfo.umd = path.resolve(entryPoint, main);
+    entryPointInfo.umd = path.resolve(entryPointPath, main);
   }
 
   return entryPointInfo;

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

@@ -0,0 +1,58 @@
+/**
+ * @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 {BundleProgram, makeBundleProgram} from './bundle_program';
+import {EntryPoint, EntryPointFormat} from './entry_point';
+
+
+/**
+ * A bundle of files and paths (and TS programs) that correspond to a particular
+ * format of a package entry-point.
+ */
+export interface EntryPointBundle {
+  format: EntryPointFormat;
+  isFlat: boolean;
+  rootDirs: string[];
+  src: BundleProgram;
+  dts: BundleProgram|null;
+}
+
+/**
+ * Get an object that describes a formatted bundle for an entry-point.
+ * @param entryPoint The entry-point that contains the bundle.
+ * @param format The format of the bundle.
+ * @param transformDts True if processing this bundle should also process its `.d.ts` files.
+ */
+export function makeEntryPointBundle(
+    entryPoint: EntryPoint, isCore: boolean, format: EntryPointFormat,
+    transformDts: boolean): EntryPointBundle|null {
+  // Bail out if the entry-point does not have this format.
+  const path = entryPoint[format];
+  if (!path) {
+    return null;
+  }
+
+  // Create the TS program and necessary helpers.
+  const options: ts.CompilerOptions = {
+    allowJs: true,
+    maxNodeModuleJsDepth: Infinity,
+    rootDir: entryPoint.path,
+  };
+  const host = ts.createCompilerHost(options);
+  const rootDirs = [entryPoint.path];
+
+  // Create the bundle programs, as necessary.
+  const src = makeBundleProgram(isCore, path, 'r3_symbols.js', options, host);
+  const dts = transformDts ?
+      makeBundleProgram(isCore, entryPoint.typings, 'r3_symbols.d.ts', options, host) :
+      null;
+  const isFlat = src.r3SymbolsFile === null;
+
+  return {format, rootDirs, isFlat, src, dts};
+}

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

@@ -5,13 +5,16 @@
  * 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 {dirname, resolve} from 'canonical-path';
-import {existsSync, lstatSync, readdirSync, writeFileSync} from 'fs';
+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 {SwitchMarkerAnalyzer} from '../analysis/switch_marker_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 {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';
@@ -19,9 +22,10 @@ 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 {BundleInfo, createBundleInfo} from './bundle';
-import {EntryPoint, EntryPointFormat} from './entry_point';
+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
@@ -31,9 +35,11 @@ import {EntryPoint, EntryPointFormat} from './entry_point';
  * parsed to identify the decorated exported classes that need to be analyzed and compiled by one or
  * more `DecoratorHandler` objects.
  *
- * Each entry point to a package is identified by a `SourceFile` that can be parsed and analyzed to
+ * Each entry point to a package is identified by a `package.json` which contains properties that
+ * indicate what formatted bundles are accessible via this end-point.
+ *
+ * Each bundle is identified by a root `SourceFile` that can be parsed and analyzed to
  * identify classes that need to be transformed; and then finally rendered and written to disk.
- * The actual file which needs to be transformed depends upon the package format.
  *
  * Along with the source files, the corresponding source maps (either inline or external) and
  * `.d.ts` files are transformed accordingly.
@@ -45,124 +51,80 @@ import {EntryPoint, EntryPointFormat} from './entry_point';
 export class Transformer {
   constructor(private sourcePath: string, private targetPath: string) {}
 
-  transform(entryPoint: EntryPoint, format: EntryPointFormat, transformDts: boolean): void {
-    if (checkMarkerFile(entryPoint, format)) {
-      console.warn(`Skipping ${entryPoint.name} : ${format} (already built).`);
-      return;
-    }
+  /**
+   * Transform the source (and typings) files of a bundle.
+   * @param bundle the bundle to transform.
+   */
+  transform(entryPoint: EntryPoint, isCore: boolean, bundle: EntryPointBundle): void {
+    console.warn(`Compiling ${entryPoint.name} - ${bundle.format}`);
 
-    const entryPointFilePath = entryPoint[format];
-    if (!entryPointFilePath) {
-      console.warn(
-          `Skipping ${entryPoint.name} : ${format} (no entry point file for this format).`);
-      return;
-    }
-
-    console.warn(`Compiling ${entryPoint.name} - ${format}`);
-
-    const options: ts.CompilerOptions = {
-      allowJs: true,
-      maxNodeModuleJsDepth: Infinity,
-      rootDir: entryPoint.path,
-    };
-
-    // Create the TS program and necessary helpers.
-    // TODO : create a custom compiler host that reads from .bak files if available.
-    const host = ts.createCompilerHost(options);
-    const rootDirs = this.getRootDirs(host, options);
-    const isCore = entryPoint.name === '@angular/core';
-    const r3SymbolsPath =
-        isCore ? this.findR3SymbolsPath(dirname(entryPointFilePath), 'r3_symbols.js') : null;
-    const rootPaths = r3SymbolsPath ? [entryPointFilePath, r3SymbolsPath] : [entryPointFilePath];
-    const packageProgram = ts.createProgram(rootPaths, options, host);
-    const r3SymbolsFile = r3SymbolsPath && packageProgram.getSourceFile(r3SymbolsPath) || null;
-
-    // Create the program for processing DTS files if enabled for this format.
-    const dtsFilePath = entryPoint.typings;
-    let dtsProgram: ts.Program|null = null;
-    let r3SymbolsDtsFile: ts.SourceFile|null = null;
-    if (transformDts) {
-      console.time(`${entryPoint.name} (dtsMapper creation)`);
-      const r3SymbolsDtsPath =
-          isCore ? this.findR3SymbolsPath(dirname(dtsFilePath), 'r3_symbols.d.ts') : null;
-      const rootDtsPaths = r3SymbolsDtsPath ? [dtsFilePath, r3SymbolsDtsPath] : [dtsFilePath];
-
-      dtsProgram = ts.createProgram(rootDtsPaths, options, host);
-      r3SymbolsDtsFile = r3SymbolsDtsPath && dtsProgram.getSourceFile(r3SymbolsDtsPath) || null;
-      console.timeEnd(`${entryPoint.name} (dtsMapper creation)`);
-    }
-
-    const bundle = createBundleInfo(isCore, r3SymbolsFile, r3SymbolsDtsFile);
-    const reflectionHost = this.getHost(isCore, format, packageProgram, dtsFilePath, dtsProgram);
+    const reflectionHost = this.getHost(isCore, bundle);
 
     // Parse and analyze the files.
-    const {decorationAnalyses, switchMarkerAnalyses} =
-        this.analyzeProgram(packageProgram, reflectionHost, rootDirs, isCore);
+    const {decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
+           moduleWithProvidersAnalyses} = this.analyzeProgram(reflectionHost, isCore, bundle);
 
-    console.time(`${entryPoint.name} (rendering)`);
     // Transform the source files and source maps.
-    const renderer = this.getRenderer(format, packageProgram, reflectionHost, bundle, transformDts);
-    const renderedFiles =
-        renderer.renderProgram(packageProgram, decorationAnalyses, switchMarkerAnalyses);
-    console.timeEnd(`${entryPoint.name} (rendering)`);
+    const renderer = this.getRenderer(reflectionHost, isCore, bundle);
+    const renderedFiles = renderer.renderProgram(
+        decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
+        moduleWithProvidersAnalyses);
 
     // Write out all the transformed files.
     renderedFiles.forEach(file => this.writeFile(file));
-
-    // Write the built-with-ngcc marker
-    writeMarkerFile(entryPoint, format);
   }
 
-  getRootDirs(host: ts.CompilerHost, options: ts.CompilerOptions) {
-    if (options.rootDirs !== undefined) {
-      return options.rootDirs;
-    } else if (options.rootDir !== undefined) {
-      return [options.rootDir];
-    } else {
-      return [host.getCurrentDirectory()];
-    }
-  }
-
-  getHost(
-      isCore: boolean, format: string, program: ts.Program, dtsFilePath: string,
-      dtsProgram: ts.Program|null): NgccReflectionHost {
-    switch (format) {
+  getHost(isCore: boolean, bundle: EntryPointBundle): NgccReflectionHost {
+    const typeChecker = bundle.src.program.getTypeChecker();
+    switch (bundle.format) {
       case 'esm2015':
       case 'fesm2015':
-        return new Esm2015ReflectionHost(isCore, program.getTypeChecker(), dtsFilePath, dtsProgram);
+        return new Esm2015ReflectionHost(isCore, typeChecker, bundle.dts);
       case 'esm5':
       case 'fesm5':
-        return new Esm5ReflectionHost(isCore, program.getTypeChecker());
+        return new Esm5ReflectionHost(isCore, typeChecker);
       default:
-        throw new Error(`Relection host for "${format}" not yet implemented.`);
+        throw new Error(`Reflection host for "${bundle.format}" not yet implemented.`);
     }
   }
 
-  getRenderer(
-      format: string, program: ts.Program, host: NgccReflectionHost, bundle: BundleInfo,
-      transformDts: boolean): Renderer {
-    switch (format) {
+  getRenderer(host: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle): Renderer {
+    switch (bundle.format) {
       case 'esm2015':
       case 'fesm2015':
-        return new EsmRenderer(host, bundle, this.sourcePath, this.targetPath, transformDts);
+        return new EsmRenderer(host, isCore, bundle, this.sourcePath, this.targetPath);
       case 'esm5':
       case 'fesm5':
-        return new Esm5Renderer(host, bundle, this.sourcePath, this.targetPath, transformDts);
+        return new Esm5Renderer(host, isCore, bundle, this.sourcePath, this.targetPath);
       default:
-        throw new Error(`Renderer for "${format}" not yet implemented.`);
+        throw new Error(`Renderer for "${bundle.format}" not yet implemented.`);
     }
   }
 
-  analyzeProgram(
-      program: ts.Program, reflectionHost: NgccReflectionHost, rootDirs: string[],
-      isCore: boolean) {
-    const decorationAnalyzer =
-        new DecorationAnalyzer(program.getTypeChecker(), reflectionHost, rootDirs, isCore);
+  analyzeProgram(reflectionHost: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle):
+      ProgramAnalyses {
+    const typeChecker = bundle.src.program.getTypeChecker();
+    const referencesRegistry = new NgccReferencesRegistry(reflectionHost);
+
     const switchMarkerAnalyzer = new SwitchMarkerAnalyzer(reflectionHost);
-    return {
-      decorationAnalyses: decorationAnalyzer.analyzeProgram(program),
-      switchMarkerAnalyses: switchMarkerAnalyzer.analyzeProgram(program),
-    };
+    const switchMarkerAnalyses = switchMarkerAnalyzer.analyzeProgram(bundle.src.program);
+
+    const decorationAnalyzer = new DecorationAnalyzer(
+        typeChecker, reflectionHost, referencesRegistry, bundle.rootDirs, isCore);
+    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 privateDeclarationsAnalyses =
+        privateDeclarationsAnalyzer.analyzeProgram(bundle.src.program);
+
+    return {decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses,
+            moduleWithProvidersAnalyses};
   }
 
   writeFile(file: FileInfo): void {
@@ -173,32 +135,12 @@ export class Transformer {
     }
     writeFileSync(file.path, file.contents, 'utf8');
   }
-
-  findR3SymbolsPath(directory: string, fileName: string): string|null {
-    const r3SymbolsFilePath = resolve(directory, fileName);
-    if (existsSync(r3SymbolsFilePath)) {
-      return r3SymbolsFilePath;
-    }
-
-    const subDirectories =
-        readdirSync(directory)
-            // Not interested in hidden files
-            .filter(p => !p.startsWith('.'))
-            // Ignore node_modules
-            .filter(p => p !== 'node_modules')
-            // Only interested in directories (and only those that are not symlinks)
-            .filter(p => {
-              const stat = lstatSync(resolve(directory, p));
-              return stat.isDirectory() && !stat.isSymbolicLink();
-            });
-
-    for (const subDirectory of subDirectories) {
-      const r3SymbolsFilePath = this.findR3SymbolsPath(resolve(directory, subDirectory), fileName);
-      if (r3SymbolsFilePath) {
-        return r3SymbolsFilePath;
-      }
-    }
-
-    return null;
-  }
+}
+
+
+interface ProgramAnalyses {
+  decorationAnalyses: Map<ts.SourceFile, CompiledFile>;
+  switchMarkerAnalyses: SwitchMarkerAnalyses;
+  privateDeclarationsAnalyses: ExportInfo[];
+  moduleWithProvidersAnalyses: ModuleWithProvidersAnalyses|null;
 }

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

@@ -9,14 +9,14 @@ import * as ts from 'typescript';
 import MagicString from 'magic-string';
 import {NgccReflectionHost} from '../host/ngcc_host';
 import {CompiledClass} from '../analysis/decoration_analyzer';
-import {BundleInfo} from '../packages/bundle';
 import {EsmRenderer} from './esm_renderer';
+import {EntryPointBundle} from '../packages/entry_point_bundle';
 
 export class Esm5Renderer extends EsmRenderer {
   constructor(
-      protected host: NgccReflectionHost, protected bundle: BundleInfo,
-      protected sourcePath: string, protected targetPath: string, transformDts: boolean) {
-    super(host, bundle, sourcePath, targetPath, transformDts);
+      host: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle, sourcePath: string,
+      targetPath: string) {
+    super(host, isCore, bundle, sourcePath, targetPath);
   }
 
   /**

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

@@ -5,18 +5,19 @@
  * 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 {dirname, relative} from 'canonical-path';
 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 {BundleInfo} from '../packages/bundle';
-import {Renderer} from './renderer';
+import {RedundantDecoratorMap, Renderer, stripExtension} from './renderer';
+import {EntryPointBundle} from '../packages/entry_point_bundle';
 
 export class EsmRenderer extends Renderer {
   constructor(
-      protected host: NgccReflectionHost, protected bundle: BundleInfo,
-      protected sourcePath: string, protected targetPath: string, transformDts: boolean) {
-    super(host, bundle, sourcePath, targetPath, transformDts);
+      host: NgccReflectionHost, isCore: boolean, bundle: EntryPointBundle, sourcePath: string,
+      targetPath: string) {
+    super(host, isCore, bundle, sourcePath, targetPath);
   }
 
   /**
@@ -27,6 +28,19 @@ export class EsmRenderer extends Renderer {
     imports.forEach(i => { output.appendLeft(0, `import * as ${i.as} from '${i.name}';\n`); });
   }
 
+  addExports(output: MagicString, entryPointBasePath: string, exports: {
+    identifier: string,
+    from: string
+  }[]): void {
+    exports.forEach(e => {
+      const basePath = stripExtension(e.from);
+      const relativePath = './' + relative(dirname(entryPointBasePath), basePath);
+      const exportFrom = entryPointBasePath !== basePath ? ` from '${relativePath}'` : '';
+      const exportStr = `\nexport {${e.identifier}}${exportFrom};`;
+      output.append(exportStr);
+    });
+  }
+
   addConstants(output: MagicString, constants: string, file: ts.SourceFile): void {
     if (constants === '') {
       return;
@@ -56,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,13 +15,15 @@ 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 {BundleInfo} from '../packages/bundle';
 import {IMPORT_PREFIX} from '../constants';
 import {NgccReflectionHost, SwitchableVariableDeclaration} from '../host/ngcc_host';
+import {EntryPointBundle} from '../packages/entry_point_bundle';
 
 interface SourceMapInfo {
   source: string;
@@ -48,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`.
  *
@@ -56,29 +80,39 @@ interface DtsClassInfo {
  */
 export abstract class Renderer {
   constructor(
-      protected host: NgccReflectionHost, protected bundle: BundleInfo,
-      protected sourcePath: string, protected targetPath: string, protected transformDts: boolean) {
-  }
+      protected host: NgccReflectionHost, protected isCore: boolean,
+      protected bundle: EntryPointBundle, protected sourcePath: string,
+      protected targetPath: string) {}
 
   renderProgram(
-      program: ts.Program, decorationAnalyses: DecorationAnalyses,
-      switchMarkerAnalyses: SwitchMarkerAnalyses): FileInfo[] {
+      decorationAnalyses: DecorationAnalyses, switchMarkerAnalyses: SwitchMarkerAnalyses,
+      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses,
+      moduleWithProvidersAnalyses: ModuleWithProvidersAnalyses|null): FileInfo[] {
     const renderedFiles: FileInfo[] = [];
 
     // Transform the source files.
-    program.getSourceFiles().map(sourceFile => {
+    this.bundle.src.program.getSourceFiles().map(sourceFile => {
       const compiledFile = decorationAnalyses.get(sourceFile);
       const switchMarkerAnalysis = switchMarkerAnalyses.get(sourceFile);
 
-      if (compiledFile || switchMarkerAnalysis) {
-        renderedFiles.push(...this.renderFile(sourceFile, compiledFile, switchMarkerAnalysis));
+      if (compiledFile || switchMarkerAnalysis || sourceFile === this.bundle.src.file) {
+        renderedFiles.push(...this.renderFile(
+            sourceFile, compiledFile, switchMarkerAnalysis, privateDeclarationsAnalyses));
       }
     });
 
-    if (this.transformDts) {
-      // Transform the .d.ts files
-      const dtsFiles = this.getTypingsFilesToRender(decorationAnalyses);
-      dtsFiles.forEach((classes, file) => renderedFiles.push(...this.renderDtsFile(file, classes)));
+    // Transform the .d.ts files
+    if (this.bundle.dts) {
+      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, new DtsRenderInfo());
+      }
+      dtsFiles.forEach(
+          (renderInfo, file) => renderedFiles.push(...this.renderDtsFile(file, renderInfo)));
     }
 
     return renderedFiles;
@@ -91,7 +125,8 @@ export abstract class Renderer {
    */
   renderFile(
       sourceFile: ts.SourceFile, compiledFile: CompiledFile|undefined,
-      switchMarkerAnalysis: SwitchMarkerAnalysis|undefined): FileInfo[] {
+      switchMarkerAnalysis: SwitchMarkerAnalysis|undefined,
+      privateDeclarationsAnalyses: PrivateDeclarationsAnalyses): FileInfo[] {
     const input = this.extractSourceMap(sourceFile);
     const outputText = new MagicString(input.source);
 
@@ -101,14 +136,16 @@ export abstract class Renderer {
     }
 
     if (compiledFile) {
-      const importManager =
-          new NgccImportManager(this.bundle.isFlat, this.bundle.isCore, IMPORT_PREFIX);
-      const decoratorsToRemove = new Map<ts.Node, ts.Node[]>();
+      const importManager = new NgccImportManager(this.bundle.isFlat, this.isCore, IMPORT_PREFIX);
+
+      // 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(
@@ -118,22 +155,24 @@ export abstract class Renderer {
 
       this.addImports(
           outputText, importManager.getAllImports(
-                          compiledFile.sourceFile.fileName, this.bundle.rewriteCoreImportsTo));
+                          compiledFile.sourceFile.fileName, this.bundle.src.r3SymbolsFile));
+    }
 
-      // TODO: remove contructor 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
+    if (sourceFile === this.bundle.src.file) {
+      const entryPointBasePath = stripExtension(this.bundle.src.path);
+      this.addExports(outputText, entryPointBasePath, privateDeclarationsAnalyses);
     }
 
     return this.renderSourceAndMap(sourceFile, input, outputText);
   }
 
-  renderDtsFile(dtsFile: ts.SourceFile, dtsClasses: DtsClassInfo[]): 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.bundle.isCore, IMPORT_PREFIX);
+    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);
@@ -142,38 +181,102 @@ export abstract class Renderer {
       });
     });
 
+    this.addModuleWithProvidersParams(outputText, renderInfo.moduleWithProviders, importManager);
     this.addImports(
-        outputText,
-        importManager.getAllImports(dtsFile.fileName, this.bundle.rewriteCoreDtsImportsTo));
+        outputText, importManager.getAllImports(dtsFile.fileName, this.bundle.dts !.r3SymbolsFile));
+
+    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;
+  protected abstract addExports(output: MagicString, entryPointBasePath: string, exports: {
+    identifier: string,
+    from: string
+  }[]): void;
   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;
   }
 
   /**
@@ -254,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'));
+  }
 }
 
 /**
@@ -337,6 +485,10 @@ export function renderDefinitions(
   return definitions;
 }
 
+export function stripExtension(filePath: string): string {
+  return filePath.replace(/\.(js|d\.ts)$/, '');
+}
+
 /**
  * Create an Angular AST statement node that contains the assignment of the
  * compiled decorator to be applied to the class.
@@ -347,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}`;
+}

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

@@ -40,3 +40,13 @@ export function findAll<T>(node: ts.Node, test: (node: ts.Node) => node is ts.No
     }
   }
 }
+
+/**
+ * Does the given declaration have a name which is an identifier?
+ * @param declaration The declaration to test.
+ * @returns true if the declaration has an identifer for a name.
+ */
+export function hasNameIdentifier(declaration: ts.Declaration): declaration is ts.Declaration&
+    {name: ts.Identifier} {
+  return ts.isIdentifier((declaration as any).name);
+}

packages/compiler-cli/src/ngcc/test/analysis/decoration_analyzer_spec.ts

@@ -10,9 +10,10 @@ import * as ts from 'typescript';
 import {Decorator} from '../../../ngtsc/host';
 import {DecoratorHandler} from '../../../ngtsc/transform';
 import {DecorationAnalyses, DecorationAnalyzer} from '../../src/analysis/decoration_analyzer';
+import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
 import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
 
-import {makeProgram} from '../helpers/utils';
+import {makeTestProgram} from '../helpers/utils';
 
 const TEST_PROGRAM = {
   name: 'test.js',
@@ -83,10 +84,11 @@ describe('DecorationAnalyzer', () => {
     let result: DecorationAnalyses;
 
     beforeEach(() => {
-      program = makeProgram(TEST_PROGRAM);
-      const analyzer = new DecorationAnalyzer(
-          program.getTypeChecker(), new Esm2015ReflectionHost(false, program.getTypeChecker()),
-          [''], false);
+      program = makeTestProgram(TEST_PROGRAM);
+      const host = new Esm2015ReflectionHost(false, program.getTypeChecker());
+      const referencesRegistry = new NgccReferencesRegistry(host);
+      const analyzer =
+          new DecorationAnalyzer(program.getTypeChecker(), host, referencesRegistry, [''], false);
       testHandler = createTestHandler();
       analyzer.handlers = [testHandler];
       result = analyzer.analyzeProgram(program);
@@ -125,10 +127,11 @@ describe('DecorationAnalyzer', () => {
       // is not yet solved.
       it('should analyze an internally imported component, which is not publicly exported from the entry-point',
          () => {
-           const program = makeProgram(...INTERNAL_COMPONENT_PROGRAM);
+           const program = makeTestProgram(...INTERNAL_COMPONENT_PROGRAM);
+           const host = new Esm2015ReflectionHost(false, program.getTypeChecker());
+           const referencesRegistry = new NgccReferencesRegistry(host);
            const analyzer = new DecorationAnalyzer(
-               program.getTypeChecker(), new Esm2015ReflectionHost(false, program.getTypeChecker()),
-               [''], false);
+               program.getTypeChecker(), host, referencesRegistry, [''], false);
            const testHandler = createTestHandler();
            analyzer.handlers = [testHandler];
            const result = analyzer.analyzeProgram(program);
@@ -141,10 +144,11 @@ describe('DecorationAnalyzer', () => {
          });
 
       it('should analyze an internally defined component, which is not exported at all', () => {
-        const program = makeProgram(...INTERNAL_COMPONENT_PROGRAM);
-        const analyzer = new DecorationAnalyzer(
-            program.getTypeChecker(), new Esm2015ReflectionHost(false, program.getTypeChecker()),
-            [''], false);
+        const program = makeTestProgram(...INTERNAL_COMPONENT_PROGRAM);
+        const host = new Esm2015ReflectionHost(false, program.getTypeChecker());
+        const referencesRegistry = new NgccReferencesRegistry(host);
+        const analyzer =
+            new DecorationAnalyzer(program.getTypeChecker(), host, referencesRegistry, [''], false);
         const testHandler = createTestHandler();
         analyzer.handlers = [testHandler];
         const result = analyzer.analyzeProgram(program);

packages/compiler-cli/src/ngcc/test/analysis/module_with_providers_analyzer_spec.ts

@@ -0,0 +1,401 @@
+/**
+ * @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 {ModuleWithProvidersAnalyses, ModuleWithProvidersAnalyzer} from '../../src/analysis/module_with_providers_analyzer';
+import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
+import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
+import {BundleProgram} from '../../src/packages/bundle_program';
+import {getDeclaration, makeTestBundleProgram, makeTestProgram} from '../helpers/utils';
+
+const TEST_PROGRAM = [
+  {
+    name: '/src/entry-point.js',
+    contents: `
+    export * from './explicit';
+    export * from './any';
+    export * from './implicit';
+    export * from './no-providers';
+    export * from './module';
+  `
+  },
+  {
+    name: '/src/explicit.js',
+    contents: `
+    import {ExternalModule} from './module';
+    import {LibraryModule} from 'some-library';
+    export class ExplicitInternalModule {}
+    export function explicitInternalFunction() {
+      return {
+        ngModule: ExplicitInternalModule,
+        providers: []
+      };
+    }
+    export function explicitExternalFunction() {
+      return {
+        ngModule: ExternalModule,
+        providers: []
+      };
+    }
+    export function explicitLibraryFunction() {
+      return {
+        ngModule: LibraryModule,
+        providers: []
+      };
+    }
+    export class ExplicitClass {
+      static explicitInternalMethod() {
+        return {
+          ngModule: ExplicitInternalModule,
+          providers: []
+        };
+      }
+      static explicitExternalMethod() {
+        return {
+          ngModule: ExternalModule,
+          providers: []
+        };
+      }
+      static explicitLibraryMethod() {
+        return {
+          ngModule: LibraryModule,
+          providers: []
+        };
+      }
+    }
+    `
+  },
+  {
+    name: '/src/any.js',
+    contents: `
+    import {ExternalModule} from './module';
+    import {LibraryModule} from 'some-library';
+    export class AnyInternalModule {}
+    export function anyInternalFunction() {
+      return {
+        ngModule: AnyInternalModule,
+        providers: []
+      };
+    }
+    export function anyExternalFunction() {
+      return {
+        ngModule: ExternalModule,
+        providers: []
+      };
+    }
+    export function anyLibraryFunction() {
+      return {
+        ngModule: LibraryModule,
+        providers: []
+      };
+    }
+    export class AnyClass {
+      static anyInternalMethod() {
+        return {
+          ngModule: AnyInternalModule,
+          providers: []
+        };
+      }
+      static anyExternalMethod() {
+        return {
+          ngModule: ExternalModule,
+          providers: []
+        };
+      }
+      static anyLibraryMethod() {
+        return {
+          ngModule: LibraryModule,
+          providers: []
+        };
+      }
+    }
+    `
+  },
+  {
+    name: '/src/implicit.js',
+    contents: `
+    import {ExternalModule} from './module';
+    import {LibraryModule} from 'some-library';
+    export class ImplicitInternalModule {}
+    export function implicitInternalFunction() {
+      return {
+        ngModule: ImplicitInternalModule,
+        providers: [],
+      };
+    }
+    export function implicitExternalFunction() {
+      return {
+        ngModule: ExternalModule,
+        providers: [],
+      };
+    }
+    export function implicitLibraryFunction() {
+      return {
+        ngModule: LibraryModule,
+        providers: [],
+      };
+    }
+    export class ImplicitClass {
+      static implicitInternalMethod() {
+        return {
+          ngModule: ImplicitInternalModule,
+          providers: [],
+        };
+      }
+      static implicitExternalMethod() {
+        return {
+          ngModule: ExternalModule,
+          providers: [],
+        };
+      }
+      static implicitLibraryMethod() {
+        return {
+          ngModule: LibraryModule,
+          providers: [],
+        };
+      }
+    }
+    `
+  },
+  {
+    name: '/src/no-providers.js',
+    contents: `
+    import {ExternalModule} from './module';
+    import {LibraryModule} from 'some-library';
+    export class NoProvidersInternalModule {}
+    export function noProvExplicitInternalFunction() {
+      return {ngModule: NoProvidersInternalModule};
+    }
+    export function noProvExplicitExternalFunction() {
+      return {ngModule: ExternalModule};
+    }
+    export function noProvExplicitLibraryFunction() {
+      return {ngModule: LibraryModule};
+    }
+    export function noProvAnyInternalFunction() {
+      return {ngModule: NoProvidersInternalModule};
+    }
+    export function noProvAnyExternalFunction() {
+      return {ngModule: ExternalModule};
+    }
+    export function noProvAnyLibraryFunction() {
+      return {ngModule: LibraryModule};
+    }
+    export function noProvImplicitInternalFunction() {
+      return {ngModule: NoProvidersInternalModule};
+    }
+    export function noProvImplicitExternalFunction() {
+      return {ngModule: ExternalModule};
+    }
+    export function noProvImplicitLibraryFunction() {
+      return {ngModule: LibraryModule};
+    }
+    `
+  },
+  {
+    name: '/src/module.js',
+    contents: `
+    export class ExternalModule {}
+    `
+  },
+  {
+    name: '/node_modules/some-library/index.d.ts',
+    contents: 'export declare class LibraryModule {}'
+  },
+];
+const TEST_DTS_PROGRAM = [
+  {
+    name: '/typings/entry-point.d.ts',
+    contents: `
+    export * from './explicit';
+    export * from './any';
+    export * from './implicit';
+    export * from './no-providers';
+    export * from './module';
+  `
+  },
+  {
+    name: '/typings/explicit.d.ts',
+    contents: `
+    import {ModuleWithProviders} from './core';
+    import {ExternalModule} from './module';
+    import {LibraryModule} from 'some-library';
+    export declare class ExplicitInternalModule {}
+    export declare function explicitInternalFunction(): ModuleWithProviders<ExplicitInternalModule>;
+    export declare function explicitExternalFunction(): ModuleWithProviders<ExternalModule>;
+    export declare function explicitLibraryFunction(): ModuleWithProviders<LibraryModule>;
+    export declare class ExplicitClass {
+      static explicitInternalMethod(): ModuleWithProviders<ExplicitInternalModule>;
+      static explicitExternalMethod(): ModuleWithProviders<ExternalModule>;
+      static explicitLibraryMethod(): ModuleWithProviders<LibraryModule>;
+    }
+    `
+  },
+  {
+    name: '/typings/any.d.ts',
+    contents: `
+    import {ModuleWithProviders} from './core';
+    export declare class AnyInternalModule {}
+    export declare function anyInternalFunction(): ModuleWithProviders<any>;
+    export declare function anyExternalFunction(): ModuleWithProviders<any>;
+    export declare function anyLibraryFunction(): ModuleWithProviders<any>;
+    export declare class AnyClass {
+      static anyInternalMethod(): ModuleWithProviders<any>;
+      static anyExternalMethod(): ModuleWithProviders<any>;
+      static anyLibraryMethod(): ModuleWithProviders<any>;
+    }
+    `
+  },
+  {
+    name: '/typings/implicit.d.ts',
+    contents: `
+    import {ExternalModule} from './module';
+    import {LibraryModule} from 'some-library';
+    export declare class ImplicitInternalModule {}
+    export declare function implicitInternalFunction(): { ngModule: typeof ImplicitInternalModule; providers: never[]; };
+    export declare function implicitExternalFunction(): { ngModule: typeof ExternalModule; providers: never[]; };
+    export declare function implicitLibraryFunction(): { ngModule: typeof LibraryModule; providers: never[]; };
+    export declare class ImplicitClass {
+      static implicitInternalMethod(): { ngModule: typeof ImplicitInternalModule; providers: never[]; };
+      static implicitExternalMethod(): { ngModule: typeof ExternalModule; providers: never[]; };
+      static implicitLibraryMethod(): { ngModule: typeof LibraryModule; providers: never[]; };
+    }
+    `
+  },
+  {
+    name: '/typings/no-providers.d.ts',
+    contents: `
+    import {ModuleWithProviders} from './core';
+    import {ExternalModule} from './module';
+    import {LibraryModule} from 'some-library';
+    export declare class NoProvidersInternalModule {}
+    export declare function noProvExplicitInternalFunction(): ModuleWithProviders<NoProvidersInternalModule>;
+    export declare function noProvExplicitExternalFunction(): ModuleWithProviders<ExternalModule>;
+    export declare function noProvExplicitLibraryFunction(): ModuleWithProviders<LibraryModule>;
+    export declare function noProvAnyInternalFunction(): ModuleWithProviders<any>;
+    export declare function noProvAnyExternalFunction(): ModuleWithProviders<any>;
+    export declare function noProvAnyLibraryFunction(): ModuleWithProviders<any>;
+    export declare function noProvImplicitInternalFunction(): { ngModule: typeof NoProvidersInternalModule; };
+    export declare function noProvImplicitExternalFunction(): { ngModule: typeof ExternalModule; };
+    export declare function noProvImplicitLibraryFunction(): { ngModule: typeof LibraryModule; };
+    `
+  },
+  {
+    name: '/typings/module.d.ts',
+    contents: `
+    export declare class ExternalModule {}
+    `
+  },
+  {
+    name: '/typings/core.d.ts',
+    contents: `
+
+    export declare interface Type<T> {
+      new (...args: any[]): T
+    }
+    export declare type Provider = any;
+    export declare interface ModuleWithProviders<T> {
+      ngModule: Type<T>
+      providers?: Provider[]
+    }
+  `
+  },
+  {
+    name: '/node_modules/some-library/index.d.ts',
+    contents: 'export declare class LibraryModule {}'
+  },
+];
+
+describe('ModuleWithProvidersAnalyzer', () => {
+  describe('analyzeProgram()', () => {
+    let analyses: ModuleWithProvidersAnalyses;
+    let program: ts.Program;
+    let dtsProgram: BundleProgram;
+    let referencesRegistry: NgccReferencesRegistry;
+
+    beforeAll(() => {
+      program = makeTestProgram(...TEST_PROGRAM);
+      dtsProgram = makeTestBundleProgram(TEST_DTS_PROGRAM);
+      const host = new Esm2015ReflectionHost(false, program.getTypeChecker(), dtsProgram);
+      referencesRegistry = new NgccReferencesRegistry(host);
+
+      const analyzer = new ModuleWithProvidersAnalyzer(host, referencesRegistry);
+      analyses = analyzer.analyzeProgram(program);
+    });
+
+    it('should ignore declarations that already have explicit NgModule type params',
+       () => { expect(getAnalysisDescription(analyses, '/typings/explicit.d.ts')).toEqual([]); });
+
+    it('should find declarations that use `any` for the NgModule type param', () => {
+      const anyAnalysis = getAnalysisDescription(analyses, '/typings/any.d.ts');
+      expect(anyAnalysis).toContain(['anyInternalFunction', 'AnyInternalModule', null]);
+      expect(anyAnalysis).toContain(['anyExternalFunction', 'ExternalModule', null]);
+      expect(anyAnalysis).toContain(['anyLibraryFunction', 'LibraryModule', 'some-library']);
+      expect(anyAnalysis).toContain(['anyInternalMethod', 'AnyInternalModule', null]);
+      expect(anyAnalysis).toContain(['anyExternalMethod', 'ExternalModule', null]);
+      expect(anyAnalysis).toContain(['anyLibraryMethod', 'LibraryModule', 'some-library']);
+    });
+
+    it('should track internal module references in the references registry', () => {
+      const declarations = referencesRegistry.getDeclarationMap();
+      const externalModuleDeclaration =
+          getDeclaration(program, '/src/module.js', 'ExternalModule', ts.isClassDeclaration);
+      const libraryModuleDeclaration = getDeclaration(
+          program, '/node_modules/some-library/index.d.ts', 'LibraryModule', ts.isClassDeclaration);
+      expect(declarations.has(externalModuleDeclaration.name !)).toBe(true);
+      expect(declarations.has(libraryModuleDeclaration.name !)).toBe(false);
+    });
+
+    it('should find declarations that have implicit return types', () => {
+      const anyAnalysis = getAnalysisDescription(analyses, '/typings/implicit.d.ts');
+      expect(anyAnalysis).toContain(['implicitInternalFunction', 'ImplicitInternalModule', null]);
+      expect(anyAnalysis).toContain(['implicitExternalFunction', 'ExternalModule', null]);
+      expect(anyAnalysis).toContain(['implicitLibraryFunction', 'LibraryModule', 'some-library']);
+      expect(anyAnalysis).toContain(['implicitInternalMethod', 'ImplicitInternalModule', null]);
+      expect(anyAnalysis).toContain(['implicitExternalMethod', 'ExternalModule', null]);
+      expect(anyAnalysis).toContain(['implicitLibraryMethod', 'LibraryModule', 'some-library']);
+    });
+
+    it('should find declarations that do not specify a `providers` property in the return type',
+       () => {
+         const anyAnalysis = getAnalysisDescription(analyses, '/typings/no-providers.d.ts');
+         expect(anyAnalysis).not.toContain([
+           'noProvExplicitInternalFunction', 'NoProvidersInternalModule'
+         ]);
+         expect(anyAnalysis).not.toContain([
+           'noProvExplicitExternalFunction', 'ExternalModule', null
+         ]);
+         expect(anyAnalysis).toContain([
+           'noProvAnyInternalFunction', 'NoProvidersInternalModule', null
+         ]);
+         expect(anyAnalysis).toContain(['noProvAnyExternalFunction', 'ExternalModule', null]);
+         expect(anyAnalysis).toContain([
+           'noProvAnyLibraryFunction', 'LibraryModule', 'some-library'
+         ]);
+         expect(anyAnalysis).toContain([
+           'noProvImplicitInternalFunction', 'NoProvidersInternalModule', null
+         ]);
+         expect(anyAnalysis).toContain(['noProvImplicitExternalFunction', 'ExternalModule', null]);
+         expect(anyAnalysis).toContain([
+           'noProvImplicitLibraryFunction', 'LibraryModule', 'some-library'
+         ]);
+       });
+
+    function getAnalysisDescription(analyses: ModuleWithProvidersAnalyses, fileName: string) {
+      const file = dtsProgram.program.getSourceFile(fileName) !;
+      const analysis = analyses.get(file);
+      return analysis ?
+          analysis.map(
+              info =>
+                  [info.declaration.name !.getText(),
+                   (info.ngModule.node as ts.ClassDeclaration).name !.getText(),
+                   info.ngModule.viaModule]) :
+          [];
+    }
+  });
+});

packages/compiler-cli/src/ngcc/test/analysis/private_declarations_analyzer_spec.ts

@@ -0,0 +1,158 @@
+/**
+ * @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 {ResolvedReference} from '@angular/compiler-cli/src/ngtsc/metadata';
+import * as ts from 'typescript';
+
+import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
+import {PrivateDeclarationsAnalyzer} from '../../src/analysis/private_declarations_analyzer';
+import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
+import {getDeclaration, makeTestBundleProgram, makeTestProgram} from '../helpers/utils';
+
+const TEST_PROGRAM = [
+  {
+    name: '/src/entry_point.js',
+    isRoot: true,
+    contents: `
+    export {PublicComponent} from './a';
+    export {ModuleA} from './mod';
+    export {ModuleB} from './b';
+  `
+  },
+  {
+    name: '/src/a.js',
+    isRoot: false,
+    contents: `
+    import {Component} from '@angular/core';
+    export class PublicComponent {}
+    PublicComponent.decorators = [
+      {type: Component, args: [{selectors: 'a', template: ''}]}
+    ];
+  `
+  },
+  {
+    name: '/src/b.js',
+    isRoot: false,
+    contents: `
+    import {Component, NgModule} from '@angular/core';
+    class PrivateComponent {}
+    PrivateComponent.decorators = [
+      {type: Component, args: [{selectors: 'b', template: ''}]}
+    ];
+    export class ModuleB {}
+    ModuleB.decorators = [
+      {type: NgModule, args: [{declarations: [PrivateComponent]}]}
+    ];
+  `
+  },
+  {
+    name: '/src/c.js',
+    isRoot: false,
+    contents: `
+    import {Component} from '@angular/core';
+    export class InternalComponent {}
+    InternalComponent.decorators = [
+      {type: Component, args: [{selectors: 'c', template: ''}]}
+    ];
+  `
+  },
+  {
+    name: '/src/mod.js',
+    isRoot: false,
+    contents: `
+    import {Component, NgModule} from '@angular/core';
+    import {PublicComponent} from './a';
+    import {ModuleB} from './b';
+    import {InternalComponent} from './c';
+    export class ModuleA {}
+    ModuleA.decorators = [
+      {type: NgModule, args: [{
+        declarations: [PublicComponent, InternalComponent],
+        imports: [ModuleB]
+      }]}
+    ];
+  `
+  }
+];
+const TEST_DTS_PROGRAM = [
+  {
+    name: '/typings/entry_point.d.ts',
+    isRoot: true,
+    contents: `
+    export {PublicComponent} from './a';
+    export {ModuleA} from './mod';
+    export {ModuleB} from './b';
+  `
+  },
+  {
+    name: '/typings/a.d.ts',
+    isRoot: false,
+    contents: `
+    export declare class PublicComponent {}
+  `
+  },
+  {
+    name: '/typings/b.d.ts',
+    isRoot: false,
+    contents: `
+    export declare class ModuleB {}
+  `
+  },
+  {
+    name: '/typings/c.d.ts',
+    isRoot: false,
+    contents: `
+    export declare class InternalComponent {}
+  `
+  },
+  {
+    name: '/typings/mod.d.ts',
+    isRoot: false,
+    contents: `
+    import {PublicComponent} from './a';
+    import {ModuleB} from './b';
+    import {InternalComponent} from './c';
+    export declare class ModuleA {}
+  `
+  },
+];
+
+describe('PrivateDeclarationsAnalyzer', () => {
+  describe('analyzeProgram()', () => {
+    it('should find all NgModule declarations that were not publicly exported from the entry-point',
+       () => {
+         const program = makeTestProgram(...TEST_PROGRAM);
+         const dts = makeTestBundleProgram(TEST_DTS_PROGRAM);
+         const host = new Esm2015ReflectionHost(false, program.getTypeChecker(), dts);
+         const referencesRegistry = new NgccReferencesRegistry(host);
+         const analyzer = new PrivateDeclarationsAnalyzer(host, referencesRegistry);
+
+         // Set up the registry with references - this would normally be done by the
+         // decoration handlers in the `DecorationAnalyzer`.
+         const publicComponentDeclaration =
+             getDeclaration(program, '/src/a.js', 'PublicComponent', ts.isClassDeclaration);
+         referencesRegistry.add(
+             new ResolvedReference(publicComponentDeclaration, publicComponentDeclaration.name !));
+         const privateComponentDeclaration =
+             getDeclaration(program, '/src/b.js', 'PrivateComponent', ts.isClassDeclaration);
+         referencesRegistry.add(new ResolvedReference(
+             privateComponentDeclaration, privateComponentDeclaration.name !));
+         const internalComponentDeclaration =
+             getDeclaration(program, '/src/c.js', 'InternalComponent', ts.isClassDeclaration);
+         referencesRegistry.add(new ResolvedReference(
+             internalComponentDeclaration, internalComponentDeclaration.name !));
+
+         const analyses = analyzer.analyzeProgram(program);
+         expect(analyses.length).toEqual(2);
+         expect(analyses).toEqual([
+           {identifier: 'PrivateComponent', from: '/src/b.js', dtsFrom: null},
+           {identifier: 'InternalComponent', from: '/src/c.js', dtsFrom: '/typings/c.d.ts'},
+         ]);
+       });
+  });
+});

packages/compiler-cli/src/ngcc/test/analysis/references_registry_spec.ts

@@ -0,0 +1,52 @@
+/**
+ * @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 {Reference, TypeScriptReflectionHost, staticallyResolve} from '../../../ngtsc/metadata';
+import {getDeclaration, makeProgram} from '../../../ngtsc/testing/in_memory_typescript';
+import {NgccReferencesRegistry} from '../../src/analysis/ngcc_references_registry';
+
+describe('NgccReferencesRegistry', () => {
+  it('should return a mapping from resolved reference identifiers to their declarations', () => {
+    const {program} = makeProgram([{
+      name: 'index.ts',
+      contents: `
+        export class SomeClass {}
+        export function someFunction() {}
+        export const someVariable = 42;
+
+        export const testArray = [SomeClass, someFunction, someVariable];
+        `
+    }]);
+
+    const checker = program.getTypeChecker();
+
+    const testArrayDeclaration =
+        getDeclaration(program, 'index.ts', 'testArray', ts.isVariableDeclaration);
+    const someClassDecl = getDeclaration(program, 'index.ts', 'SomeClass', ts.isClassDeclaration);
+    const someFunctionDecl =
+        getDeclaration(program, 'index.ts', 'someFunction', ts.isFunctionDeclaration);
+    const someVariableDecl =
+        getDeclaration(program, 'index.ts', 'someVariable', ts.isVariableDeclaration);
+    const testArrayExpression = testArrayDeclaration.initializer !;
+
+    const host = new TypeScriptReflectionHost(checker);
+    const registry = new NgccReferencesRegistry(host);
+
+    const references =
+        staticallyResolve(testArrayExpression, host, checker) as Reference<ts.Declaration>[];
+    registry.add(...references);
+
+    const map = registry.getDeclarationMap();
+    expect(map.size).toEqual(2);
+    expect(map.get(someClassDecl.name !) !.node).toBe(someClassDecl);
+    expect(map.get(someFunctionDecl.name !) !.node).toBe(someFunctionDecl);
+    expect(map.has(someVariableDecl.name as ts.Identifier)).toBe(false);
+  });
+});

packages/compiler-cli/src/ngcc/test/analysis/switch_marker_analyzer_spec.ts

@@ -9,7 +9,7 @@ import * as ts from 'typescript';
 
 import {SwitchMarkerAnalyzer} from '../../src/analysis/switch_marker_analyzer';
 import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
-import {makeProgram} from '../helpers/utils';
+import {makeTestProgram} from '../helpers/utils';
 
 const TEST_PROGRAM = [
   {
@@ -46,7 +46,7 @@ const TEST_PROGRAM = [
 describe('SwitchMarkerAnalyzer', () => {
   describe('analyzeProgram()', () => {
     it('should check for switchable markers in all the files of the program', () => {
-      const program = makeProgram(...TEST_PROGRAM);
+      const program = makeTestProgram(...TEST_PROGRAM);
       const host = new Esm2015ReflectionHost(false, program.getTypeChecker());
       const analyzer = new SwitchMarkerAnalyzer(host);
       const analysis = analyzer.analyzeProgram(program);

packages/compiler-cli/src/ngcc/test/helpers/utils.ts

@@ -6,12 +6,48 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as ts from 'typescript';
-import {makeProgram as _makeProgram} from '../../../ngtsc/testing/in_memory_typescript';
+
+import {makeProgram} from '../../../ngtsc/testing/in_memory_typescript';
+import {BundleProgram} from '../../src/packages/bundle_program';
+import {EntryPointFormat} from '../../src/packages/entry_point';
+import {EntryPointBundle} from '../../src/packages/entry_point_bundle';
 
 export {getDeclaration} from '../../../ngtsc/testing/in_memory_typescript';
 
-export function makeProgram(...files: {name: string, contents: string}[]): ts.Program {
-  return _makeProgram([getFakeCore(), getFakeTslib(), ...files], {allowJs: true, checkJs: false})
+
+/**
+ *
+ * @param format The format of the bundle.
+ * @param files The source files to include in the bundle.
+ * @param dtsFiles The typings files to include the bundle.
+ */
+export function makeTestEntryPointBundle(
+    format: EntryPointFormat, files: {name: string, contents: string, isRoot?: boolean}[],
+    dtsFiles?: {name: string, contents: string, isRoot?: boolean}[]): EntryPointBundle {
+  const src = makeTestBundleProgram(files);
+  const dts = dtsFiles ? makeTestBundleProgram(dtsFiles) : null;
+  const isFlat = src.r3SymbolsFile === null;
+  return {format, rootDirs: ['/'], src, dts, isFlat};
+}
+
+/**
+ * Create a bundle program for testing.
+ * @param files The source files of the bundle program.
+ */
+export function makeTestBundleProgram(files: {name: string, contents: string}[]): BundleProgram {
+  const program = makeTestProgram(...files);
+  const path = files[0].name;
+  const file = program.getSourceFile(path) !;
+  const r3SymbolsInfo = files.find(file => file.name.indexOf('r3_symbols') !== -1) || null;
+  const r3SymbolsPath = r3SymbolsInfo && r3SymbolsInfo.name;
+  const r3SymbolsFile = r3SymbolsPath && program.getSourceFile(r3SymbolsPath) || null;
+  return {program, path, file, r3SymbolsPath, r3SymbolsFile};
+}
+
+
+export function makeTestProgram(
+    ...files: {name: string, contents: string, isRoot?: boolean | undefined}[]): ts.Program {
+  return makeProgram([getFakeCore(), getFakeTslib(), ...files], {allowJs: true, checkJs: false})
       .program;
 }
 
@@ -48,6 +84,8 @@ export function getFakeCore() {
       export class InjectionToken {
         constructor(name: string) {}
       }
+
+      export interface ModuleWithProviders<T = any> {}
     `
   };
 }