build: idiomatic install of @angular/bazel npm package (#26258 )

build: update ngcontainer to bazel 0.18.0 (#26465 )
* build: update ngcontainer to bazel 0.18.0 * build: update skylint to bazel 0.18 use .bazelignore file to ignore node_modules directory
2018-10-16 13:20:00 -07:00 · 2018-10-15 16:51:26 -07:00 · 2018-10-05 17:57:18 -07:00 · 2018-10-05 07:16:47 -07:00 · 2018-10-04 13:14:14 -07:00 · 2018-10-02 06:46:07 -07:00
361 changed files with 19943 additions and 12294 deletions
--- a/.bazelignore
+++ b/.bazelignore
@ -0,0 +1,2 @@
+node_modules
+dist
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@ -57,6 +57,6 @@ 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=local` on
 # any bazel target. This is a temporary flag until codebase is permanently switched to Ivy.
-build --define=compile=legacy
+build --define=compile=legacy
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -12,8 +12,8 @@
 ## IMPORTANT
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.6.0
-var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.6.0
+var_1: &docker_image angular/ngcontainer:0.7.0
+var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.7.0

 # Define common ENV vars
 var_3: &define_env_vars
@ -113,6 +113,7 @@ jobs:
          paths:
            - "node_modules"
            - "~/bazel_repository_cache"
+
  # Temporary job to test what will happen when we flip the Ivy flag to true
  test_ivy_jit:
    <<: *job_defaults
@ -256,11 +257,7 @@ jobs:
          <<: *post_checkout
      - restore_cache:
          key: *cache_key
-      - run:
-          name: Run tests against the deployed apps
-          command: |
-            source "./scripts/ci/env.sh" print
-            xvfb-run --auto-servernum ./aio/scripts/test-production.sh $AIO_MIN_PWA_SCORE
+      - run: xvfb-run --auto-servernum ./aio/scripts/test-production.sh

 workflows:
  version: 2
--- a/.gitignore
+++ b/.gitignore
@ -14,7 +14,6 @@ pubspec.lock
 .settings/
 *.swo
 modules/.settings
-.bazelrc
 .vscode
 modules/.vscode

--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@ -87,10 +87,10 @@ groups:
      files:
        include:
          - "WORKSPACE"
+          - ".bazel*"
          - "*.bazel"
          - "*.bzl"
          - "packages/bazel/*"
-          - "tools/bazel.rc"
          - "/docs/BAZEL.md"
    users:
      - alexeagle #primary
@ -108,7 +108,6 @@ groups:
          - "*.lock"
          - "tools/*"
        exclude:
-          - "tools/bazel.rc"
          - "tools/public_api_guard/*"
          - "aio/*"
    users:
--- a/.travis.yml
+++ b/.travis.yml
@ -49,7 +49,6 @@ env:
    - CI_MODE=browserstack_optional
    - CI_MODE=aio_tools_test
    - CI_MODE=aio
-    - CI_MODE=aio_local
    - CI_MODE=aio_e2e AIO_SHARD=0
    - CI_MODE=aio_e2e AIO_SHARD=1

--- a/BUILD.bazel
+++ b/BUILD.bazel
@ -15,19 +15,14 @@ alias(
    actual = "@nodejs//:yarn",
 )

-alias(
-    name = "node_modules",
-    actual = "@angular_deps//:node_modules",
-)
-
 filegroup(
    name = "web_test_bootstrap_scripts",
    # do not sort
    srcs = [
-        "@angular_deps//:node_modules/reflect-metadata/Reflect.js",
-        "@angular_deps//:node_modules/zone.js/dist/zone.js",
-        "@angular_deps//:node_modules/zone.js/dist/zone-testing.js",
-        "@angular_deps//:node_modules/zone.js/dist/task-tracking.js",
+        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@ngdeps//node_modules/zone.js:dist/zone.js",
+        "@ngdeps//node_modules/zone.js:dist/zone-testing.js",
+        "@ngdeps//node_modules/zone.js:dist/task-tracking.js",
        "//:test-events.js",
    ],
 )
@ -35,11 +30,28 @@ filegroup(
 filegroup(
    name = "angularjs_scripts",
    srcs = [
-        "@angular_deps//:node_modules/angular-1.5/angular.js",
-        "@angular_deps//:node_modules/angular-1.6/angular.js",
-        "@angular_deps//:node_modules/angular-mocks-1.5/angular-mocks.js",
-        "@angular_deps//:node_modules/angular-mocks-1.6/angular-mocks.js",
-        "@angular_deps//:node_modules/angular-mocks/angular-mocks.js",
-        "@angular_deps//:node_modules/angular/angular.js",
+        "@ngdeps//node_modules/angular:angular.js",
+        "@ngdeps//node_modules/angular-1.5:angular.js",
+        "@ngdeps//node_modules/angular-1.6:angular.js",
+        "@ngdeps//node_modules/angular-mocks:angular-mocks.js",
+        "@ngdeps//node_modules/angular-mocks-1.5:angular-mocks.js",
+        "@ngdeps//node_modules/angular-mocks-1.6:angular-mocks.js",
    ],
 )
+
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+
+# A nodejs_binary for @angular/bazel/ngc-wrapped to use by default in
+# ng_module that depends on @npm//@angular/bazel instead of the
+# output of the //packages/bazel/src/ngc-wrapped ts_library rule. This
+# default is for downstream users that depend on the @angular/bazel npm
+# package. The generated @npm//@angular/bazel/ngc-wrapped target
+# does not work because it does not have the node `--expose-gc` flag
+# set which is required to support the call to `global.gc()`.
+nodejs_binary(
+    name = "@angular/bazel/ngc-wrapped",
+    data = ["@npm//@angular/bazel"],
+    entry_point = "@angular/bazel/src/ngc-wrapped/index.js",
+    install_source_map_support = False,
+    templated_args = ["--node_options=--expose-gc"],
+)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,22 +1,3 @@
-<a name="7.0.0-rc.1"></a>
-# [7.0.0-rc.1](https://github.com/angular/angular/compare/7.0.0-rc.0...7.0.0-rc.1) (2018-10-10)
-
-
-This version includes Ivy features and internal refactorings. There are no user-facing changes.
-
-
-
-<a name="6.1.10"></a>
-## [6.1.10](https://github.com/angular/angular/compare/6.1.9...6.1.10) (2018-10-10)
-
-
-### Bug Fixes
-
-* **platform-browser:** fix [#22155](https://github.com/angular/angular/issues/22155), destroy hammer manager when `HammerInstance.off()` is run ([#22156](https://github.com/angular/angular/issues/22156)) ([3b4d9dc](https://github.com/angular/angular/commit/3b4d9dc))
-* **upgrade:** properly destroy upgraded component elements and descendants ([#26209](https://github.com/angular/angular/issues/26209)) ([623adbb](https://github.com/angular/angular/commit/623adbb)), closes [#26208](https://github.com/angular/angular/issues/26208)
-
-
-
 <a name="7.0.0-rc.0"></a>
 # [7.0.0-rc.0](https://github.com/angular/angular/compare/7.0.0-beta.7...7.0.0-rc.0) (2018-09-28)

--- a/113
+++ b/113
@ -1,91 +1,24 @@
 workspace(name = "angular")

-#
-# Download Bazel toolchain dependencies as needed by build actions
-#
-http_archive(
-    name = "build_bazel_rules_typescript",
-    sha256 = "1626ee2cc9770af6950bfc77dffa027f9aedf330fe2ea2ee7e504428927bd95d",
-    strip_prefix = "rules_typescript-0.17.0",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.17.0.zip",
+load(
+    "//packages/bazel:package.bzl",
+    "rules_angular_dependencies",
+    "rules_angular_dev_dependencies",
 )

-load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
-
-rules_typescript_dependencies()
-
-http_archive(
-    name = "bazel_toolchains",
-    sha256 = "c3b08805602cd1d2b67ebe96407c1e8c6ed3d4ce55236ae2efe2f1948f38168d",
-    strip_prefix = "bazel-toolchains-5124557861ebf4c0b67f98180bff1f8551e0b421",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/5124557861ebf4c0b67f98180bff1f8551e0b421.tar.gz",
-        "https://github.com/bazelbuild/bazel-toolchains/archive/5124557861ebf4c0b67f98180bff1f8551e0b421.tar.gz",
-    ],
-)
-
-http_archive(
-    name = "io_bazel_rules_sass",
-    sha256 = "dbe9fb97d5a7833b2a733eebc78c9c1e3880f676ac8af16e58ccf2139cbcad03",
-    strip_prefix = "rules_sass-1.11.0",
-    url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip",
-)
-
-# This commit matches the version of buildifier in angular/ngcontainer
-# If you change this, also check if it matches the version in the angular/ngcontainer
-# version in /.circleci/config.yml
-BAZEL_BUILDTOOLS_VERSION = "49a6c199e3fbf5d94534b2771868677d3f9c6de9"
-
-http_archive(
-    name = "com_github_bazelbuild_buildtools",
-    sha256 = "edf39af5fc257521e4af4c40829fffe8fba6d0ebff9f4dd69a6f8f1223ae047b",
-    strip_prefix = "buildtools-%s" % BAZEL_BUILDTOOLS_VERSION,
-    url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % BAZEL_BUILDTOOLS_VERSION,
-)
-
-# Fetching the Bazel source code allows us to compile the Skylark linter
-http_archive(
-    name = "io_bazel",
-    sha256 = "ace8cced3b21e64a8fdad68508e9b0644201ec848ad583651719841d567fc66d",
-    strip_prefix = "bazel-0.17.1",
-    url = "https://github.com/bazelbuild/bazel/archive/0.17.1.zip",
-)
-
-http_archive(
-    name = "io_bazel_skydoc",
-    sha256 = "7bfb5545f59792a2745f2523b9eef363f9c3e7274791c030885e7069f8116016",
-    strip_prefix = "skydoc-fe2e9f888d28e567fef62ec9d4a93c425526d701",
-    # TODO: switch to upstream when https://github.com/bazelbuild/skydoc/pull/103 is merged
-    url = "https://github.com/alexeagle/skydoc/archive/fe2e9f888d28e567fef62ec9d4a93c425526d701.zip",
-)
-
-# We have a source dependency on the Devkit repository, because it's built with
-# Bazel.
-# This allows us to edit sources and have the effect appear immediately without
-# re-packaging or "npm link"ing.
-# Even better, things like aspects will visit the entire graph including
-# ts_library rules in the devkit repository.
-http_archive(
-    name = "angular_cli",
-    sha256 = "8cf320ea58c321e103f39087376feea502f20eaf79c61a4fdb05c7286c8684fd",
-    strip_prefix = "angular-cli-6.1.0-rc.0",
-    url = "https://github.com/angular/angular-cli/archive/v6.1.0-rc.0.zip",
-)
-
-http_archive(
-    name = "org_brotli",
-    sha256 = "774b893a0700b0692a76e2e5b7e7610dbbe330ffbe3fe864b4b52ca718061d5a",
-    strip_prefix = "brotli-1.0.5",
-    url = "https://github.com/google/brotli/archive/v1.0.5.zip",
-)
+# Angular Bazel users will call this function
+rules_angular_dependencies()
+# These are the dependencies only for us
+rules_angular_dev_dependencies()

 #
 # Point Bazel to WORKSPACEs that live in subdirectories
 #
-
-local_repository(
+http_archive(
    name = "rxjs",
-    path = "node_modules/rxjs/src",
+    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
+    strip_prefix = "package/src",
+    sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
 )

 # Point to the integration test workspace just so that Bazel doesn't descend into it
@ -98,10 +31,9 @@ local_repository(
 #
 # Load and install our dependencies downloaded above.
 #
+load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")

-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
-
-check_bazel_version("0.17.0", """
+check_bazel_version("0.18.0", """
 If you are on a Mac and using Homebrew, there is a breaking change to the installation in Bazel 0.16
 See https://blog.bazel.build/2018/08/22/bazel-homebrew.html

@ -114,6 +46,12 @@ node_repositories(
    yarn_version = "1.9.2",
 )

+yarn_install(
+    name = "npm",
+    package_json = "//tools:npm/package.json",
+    yarn_lock = "//tools:npm/yarn.lock",
+)
+
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")

 go_rules_dependencies()
@ -147,14 +85,3 @@ sass_repositories()
 load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories")

 skydoc_repositories()
-
-##################################
-# Prevent Bazel from trying to build rxjs under angular devkit
-local_repository(
-    name = "rxjs_ignore_nested_1",
-    path = "node_modules/@angular-devkit/core/node_modules/rxjs/src",
-)
-local_repository(
-    name = "rxjs_ignore_nested_2",
-    path = "node_modules/@angular-devkit/schematics/node_modules/rxjs/src",
-)
--- a/aio/aio-builds-setup/dockerbuild/nginx/aio-builds.conf
+++ b/aio/aio-builds-setup/dockerbuild/nginx/aio-builds.conf
@ -36,11 +36,6 @@ server {
  access_log {{$AIO_NGINX_LOGS_DIR}}/access.log;
  error_log  {{$AIO_NGINX_LOGS_DIR}}/error.log;

-  error_page 404 /404.html;
-  location "=/404.html" {
-    internal;
-  }
-
  location "~/[^/]+\.[^/]+$" {
    try_files $uri $uri/ =404;
  }
--- a/aio/content/examples/lazy-loading-ngmodules/src/app/app-routing.module.ts
+++ b/aio/content/examples/lazy-loading-ngmodules/src/app/app-routing.module.ts
@ -8,11 +8,11 @@ import { Routes, RouterModule } from '@angular/router';
 const routes: Routes = [
  {
    path: 'customers',
-    loadChildren: './customers/customers.module#CustomersModule'
+    loadChildren: 'app/customers/customers.module#CustomersModule'
  },
  {
    path: 'orders',
-    loadChildren: './orders/orders.module#OrdersModule'
+    loadChildren: 'app/orders/orders.module#OrdersModule'
  },
  {
    path: '',
--- a/aio/content/examples/ngmodule-faq/src/app/app-routing.module.3.ts
+++ b/aio/content/examples/ngmodule-faq/src/app/app-routing.module.3.ts
@ -5,8 +5,8 @@ import { ContactModule } from './contact/contact.module.3';

 const routes: Routes = [
  { path: '', redirectTo: 'contact', pathMatch: 'full'},
-  { path: 'crisis', loadChildren: './crisis/crisis.module#CrisisModule' },
-  { path: 'heroes', loadChildren: './hero/hero.module.3#HeroModule' }
+  { path: 'crisis', loadChildren: 'app/crisis/crisis.module#CrisisModule' },
+  { path: 'heroes', loadChildren: 'app/hero/hero.module.3#HeroModule' }
 ];

@NgModule({
--- a/aio/content/examples/ngmodule-faq/src/app/app-routing.module.ts
+++ b/aio/content/examples/ngmodule-faq/src/app/app-routing.module.ts
@ -8,8 +8,8 @@ import { ContactModule }    from './contact/contact.module';
 const routes: Routes = [
  { path: '', redirectTo: 'contact', pathMatch: 'full'},
  // #docregion lazy-routes
-  { path: 'crisis', loadChildren: './crisis/crisis.module#CrisisModule' },
-  { path: 'heroes', loadChildren: './hero/hero.module#HeroModule' }
+  { path: 'crisis', loadChildren: 'app/crisis/crisis.module#CrisisModule' },
+  { path: 'heroes', loadChildren: 'app/hero/hero.module#HeroModule' }
  // #enddocregion lazy-routes
 ];
 // #enddocregion routes
--- a/aio/content/examples/ngmodules/src/app/app-routing.module.ts
+++ b/aio/content/examples/ngmodules/src/app/app-routing.module.ts
@ -3,8 +3,8 @@ import { Routes, RouterModule } from '@angular/router';

 export const routes: Routes = [
  { path: '', redirectTo: 'contact', pathMatch: 'full'},
-  { path: 'items', loadChildren: './items/items.module#ItemsModule' },
-  { path: 'customers', loadChildren: './customers/customers.module#CustomersModule' }
+  { path: 'items', loadChildren: 'app/items/items.module#ItemsModule' },
+  { path: 'customers', loadChildren: 'app/customers/customers.module#CustomersModule' }
 ];

@NgModule({
--- a/aio/content/examples/observables/src/subscribing.ts
+++ b/aio/content/examples/observables/src/subscribing.ts
@ -4,7 +4,7 @@ import { Observable, of } from 'rxjs';
 // #docregion observer

 // Create simple observable that emits three values
-const myObservable = of(1, 2, 3);
+const myObservable = Observable.of(1, 2, 3);

 // Create observer object
 const myObserver = {
--- a/aio/content/examples/reactive-forms/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/reactive-forms/e2e/src/app.e2e-spec.ts
@ -35,14 +35,14 @@ describe('Reactive forms', function () {

    it('should update the name control when the Update Name button is clicked', async () => {
      await nameInput.sendKeys(nameText);
-      const value1 = await nameInput.getAttribute('value');
+      const value = await nameInput.getAttribute('value');

-      expect(value1).toBe(nameText);
+      expect(value).toBe(nameText);
      await updateButton.click();

-      const value2 = await nameInput.getAttribute('value');
+      const value = await nameInput.getAttribute('value');

-      expect(value2).toBe('Nancy');
+      expect(value).toBe('Nancy');
    });

    it('should update the displayed control value when the name control updated', async () => {
--- a/aio/content/examples/testing/src/app/app-routing.module.ts
+++ b/aio/content/examples/testing/src/app/app-routing.module.ts
@ -8,7 +8,7 @@ import { AboutComponent } from './about/about.component';
    RouterModule.forRoot([
      { path: '', redirectTo: 'dashboard', pathMatch: 'full'},
      { path: 'about', component: AboutComponent },
-      { path: 'heroes', loadChildren: './hero/hero.module#HeroModule'}
+      { path: 'heroes', loadChildren: 'app/hero/hero.module#HeroModule'}
    ])
  ],
  exports: [ RouterModule ] // re-export the module declarations
--- a/aio/content/examples/testing/src/app/demo/async-helper.spec.ts
+++ b/aio/content/examples/testing/src/app/demo/async-helper.spec.ts
@ -1,7 +1,8 @@
 // tslint:disable-next-line:no-unused-variable
 import { async, fakeAsync, tick } from '@angular/core/testing';
-import { interval, of } from 'rxjs';
-import { delay, take } from 'rxjs/operators';
+
+import { of } from 'rxjs';
+import { delay } from 'rxjs/operators';

 describe('Angular async helper', () => {
  let actuallyDone = false;
@ -20,120 +21,49 @@ describe('Angular async helper', () => {
  });

  it('should run async test with task',
-     async(() => { setTimeout(() => { actuallyDone = true; }, 0); }));
-
-  it('should run async test with task', async(() => {
-       const id = setInterval(() => {
-         actuallyDone = true;
-         clearInterval(id);
-       }, 100);
-     }));
+      async(() => { setTimeout(() => { actuallyDone = true; }, 0); }));

  it('should run async test with successful promise', async(() => {
-       const p = new Promise(resolve => { setTimeout(resolve, 10); });
-       p.then(() => { actuallyDone = true; });
-     }));
+    const p = new Promise(resolve => { setTimeout(resolve, 10); });
+    p.then(() => { actuallyDone = true; });
+  }));

  it('should run async test with failed promise', async(() => {
-       const p = new Promise((resolve, reject) => { setTimeout(reject, 10); });
-       p.catch(() => { actuallyDone = true; });
-     }));
+    const p = new Promise((resolve, reject) => { setTimeout(reject, 10); });
+    p.catch(() => { actuallyDone = true; });
+  }));

-  // Use done. Can also use async or fakeAsync.
+  // Use done. Cannot use setInterval with async or fakeAsync
+  // See https://github.com/angular/angular/issues/10127
  it('should run async test with successful delayed Observable', (done: DoneFn) => {
-    const source = of (true).pipe(delay(10));
-    source.subscribe(val => actuallyDone = true, err => fail(err), done);
+    const source = of(true).pipe(delay(10));
+    source.subscribe(
+      val => actuallyDone = true,
+      err => fail(err),
+      done
+    );
  });

-  // #docregion fake-async-test-tick
-  it('should run timeout callback with delay after call tick with millis', fakeAsync(() => {
-       let called = false;
-       setTimeout(() => { called = true; }, 100);
-       tick(100);
-       expect(called).toBe(true);
-     }));
-  // #enddocregion fake-async-test-tick
+  // Cannot use setInterval from within an async zone test
+  // See https://github.com/angular/angular/issues/10127
+  // xit('should run async test with successful delayed Observable', async(() => {
+  // const source = of(true).pipe(delay(10));
+  //   source.subscribe(
+  //     val => actuallyDone = true,
+  //     err => fail(err)
+  //   );
+  // }));

-  // #docregion fake-async-test-date
-  it('should get Date diff correctly in fakeAsync', fakeAsync(() => {
-       const start = Date.now();
-       tick(100);
-       const end = Date.now();
-       expect(end - start).toBe(100);
-     }));
-  // #enddocregion fake-async-test-date
+  // // Fail message: Error: 1 periodic timer(s) still in the queue
+  // // See https://github.com/angular/angular/issues/10127
+  // xit('should run async test with successful delayed Observable', fakeAsync(() => {
+  // const source = of(true).pipe(delay(10));
+  //   source.subscribe(
+  //     val => actuallyDone = true,
+  //     err => fail(err)
+  //   );

-  // #docregion fake-async-test-rxjs
-  it('should get Date diff correctly in fakeAsync with rxjs scheduler', fakeAsync(() => {
-       // need to add `import 'zone.js/dist/zone-patch-rxjs-fake-async'
-       // to patch rxjs scheduler
-       let result = null;
-       of ('hello').pipe(delay(1000)).subscribe(v => { result = v; });
-       expect(result).toBeNull();
-       tick(1000);
-       expect(result).toBe('hello');
-
-       const start = new Date().getTime();
-       let dateDiff = 0;
-       interval(1000).pipe(take(2)).subscribe(() => dateDiff = (new Date().getTime() - start));
-
-       tick(1000);
-       expect(dateDiff).toBe(1000);
-       tick(1000);
-       expect(dateDiff).toBe(2000);
-     }));
-  // #enddocregion fake-async-test-rxjs
-
-  // #docregion fake-async-test-clock
-  describe('use jasmine.clock()', () => {
-    // need to config __zone_symbol__fakeAsyncPatchLock flag
-    // before loading zone.js/dist/zone-testing
-    beforeEach(() => { jasmine.clock().install(); });
-    afterEach(() => { jasmine.clock().uninstall(); });
-    it('should auto enter fakeAsync', () => {
-      // is in fakeAsync now, don't need to call fakeAsync(testFn)
-      let called = false;
-      setTimeout(() => { called = true; }, 100);
-      jasmine.clock().tick(100);
-      expect(called).toBe(true);
-    });
-  });
-  // #enddocregion fake-async-test-clock
-
-  // #docregion async-test-promise-then
-  describe('test jsonp', () => {
-    function jsonp(url: string, callback: Function) {
-      // do a jsonp call which is not zone aware
-    }
-    // need to config __zone_symbol__supportWaitUnResolvedChainedPromise flag
-    // before loading zone.js/dist/zone-testing
-    it('should wait until promise.then is called', async(() => {
-         let finished = false;
-         new Promise((res, rej) => {
-           jsonp('localhost:8080/jsonp', () => {
-             // success callback and resolve the promise
-             finished = true;
-             res();
-           });
-         }).then(() => {
-           // async will wait until promise.then is called
-           // if __zone_symbol__supportWaitUnResolvedChainedPromise is set
-           expect(finished).toBe(true);
-         });
-       }));
-  });
-  // #enddocregion async-test-promise-then
-
-  it('should run async test with successful delayed Observable', async(() => {
-       const source = of (true).pipe(delay(10));
-       source.subscribe(val => actuallyDone = true, err => fail(err));
-     }));
-
-  it('should run async test with successful delayed Observable', fakeAsync(() => {
-       const source = of (true).pipe(delay(10));
-       source.subscribe(val => actuallyDone = true, err => fail(err));
-
-       tick(10);
-     }));
+  //   tick();
+  // }));

 });
--- a/aio/content/guide/aot-compiler.md
+++ b/aio/content/guide/aot-compiler.md
@ -1241,7 +1241,7 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
  ### Non-null type assertion operator

  Use the [non-null type assertion operator](guide/template-syntax#non-null-assertion-operator)
-  to suppress the `Object is possibly 'undefined'` error when it is inconvenient to use
+  to suppress the `Object is possibly 'undefined'` error when it is incovienent to use
  `*ngIf` or when some constraint in the component ensures that the expression is always
  non-null when the binding expression is interpolated.

@ -1366,7 +1366,7 @@ for example, the content of annotations (such as a component's template), which
 emits to the `.js` file but not to the `.d.ts` file.

 This option should be set to `true` if you are using TypeScript's `--outFile` option, because the metadata files
-are not valid for this style of TypeScript output. It is not recommended to use `--outFile` with
+are not valid for this style of TypeScript output. It is not recommeded to use `--outFile` with
 Angular. Use a bundler, such as [webpack](https://webpack.js.org/), instead.

 This option can also be set to `true` when using factory summaries because the factory summaries
@ -1461,7 +1461,7 @@ JavaScript with [JSDoc](http://usejsdoc.org/) comments needed by the
 ### *annotationsAs*

 Use this option to modify how the Angular specific annotations are emitted to improve tree-shaking. Non-Angular
-annotations and decorators are unaffected. Default is `static fields`.
+annotations and decorators are unnaffected. Default is `static fields`.

 <style>
  td, th {vertical-align: top}
--- a/aio/content/guide/attribute-directives.md
+++ b/aio/content/guide/attribute-directives.md
@ -15,7 +15,7 @@ There are three kinds of directives in Angular:
 1. Attribute directives&mdash;change the appearance or behavior of an element, component, or another directive.

 *Components* are the most common of the three directives.
-You saw a component for the first time in the [Getting Started](guide/quickstart).
+You saw a component for the first time in the [QuickStart](guide/quickstart) guide.

 *Structural Directives* change the structure of the view.
 Two examples are [NgFor](guide/template-syntax#ngFor) and [NgIf](guide/template-syntax#ngIf).
@ -61,7 +61,7 @@ The generated `src/app/highlight.directive.ts` is as follows:

 <code-example path="attribute-directives/src/app/highlight.directive.0.ts" title="src/app/highlight.directive.ts"></code-example>

-The imported `Directive` symbol provides Angular the `@Directive` decorator.
+The imported `Directive` symbol provides the Angular the `@Directive` decorator.

 The `@Directive` decorator's lone configuration property specifies the directive's
 [CSS attribute selector](https://developer.mozilla.org/en-US/docs/Web/CSS/Attribute_selectors), `[appHighlight]`.
--- a/aio/content/guide/comparing-observables.md
+++ b/aio/content/guide/comparing-observables.md
@ -19,7 +19,7 @@ Observables are often compared to promises. Here are some key differences:

 ### Creation and subscription

-* Observables are not executed until a consumer subscribes. The `subscribe()` executes the defined behavior once, and it can be called again. Each subscription has its own computation. Resubscription causes recomputation of values.
+* Observables are not executed until a consumer subcribes. The `subscribe()` executes the defined behavior once, and it can be called again. Each subscription has its own computation. Resubscription causes recomputation of values.

 <code-example hideCopy>
 // declare a publishing operation
--- a/aio/content/guide/dependency-injection-in-action.md
+++ b/aio/content/guide/dependency-injection-in-action.md
@ -149,7 +149,7 @@ By default, the DI framework searches for a provider in the injector hierarchy,
 starting at the component's local injector of the component, and if necessary bubbling up 
 through the injector tree until it reaches the root injector.

-* The first injector configured with a provider supplies the dependency (a service instance or value) to the constructor.  
+* The first injector configured with a provider supplies the the dependency (a service instance or value) to the constructor.  

 * If no provider is found in the root injector, the DI framework returns null to the constructor.

@ -260,7 +260,7 @@ Using a custom provider allows you to provide a concrete implementation for impl

 </code-example>

-The `factory` function returns the `localStorage` property that is attached to the browser window object. The `Inject` decorator is a constructor parameter used to specify a custom provider of a dependency. This custom provider can now be overridden during testing with a mock API of `localStorage` instead of interactive with real browser APIs.
+The `factory` function returns the `localStorage` property that is attached to the browser window object. The `Inject` decorator is a constructor parameter used to specify a custom provider of a dependency. This custom provider can now be overriden during testing with a mock API of `localStorage` instead of interactive with real browser APIs.

 ### Modify the provider search with `@Self` and `@SkipSelf`

--- a/aio/content/guide/dependency-injection-navtree.md
+++ b/aio/content/guide/dependency-injection-navtree.md
@ -112,7 +112,7 @@ The `CraigComponent` tries to inject `Base` into its `alex` constructor paramete



-Unfortunately, this doesn't work.
+Unfortunately, this does'nt work.
 The <live-example name="dependency-injection-in-action"></live-example>
 confirms that the `alex` parameter is null.
 *You cannot inject a parent by its base class.*
--- a/aio/content/guide/deployment.md
+++ b/aio/content/guide/deployment.md
@ -254,7 +254,7 @@ The `--prod` _meta-flag_ engages the following optimization features.
 The remaining [copy deployment steps](#copy-files) are the same as before.

 See [Building and serving Angular apps](guide/build) 
-for more about CLI build options and what they do.
+for more about about CLI build options and what they do.

 {@a enable-prod-mode}

--- a/aio/content/guide/displaying-data.md
+++ b/aio/content/guide/displaying-data.md
@ -31,7 +31,7 @@ The easiest way to display a component property
 is to bind the property name through interpolation.
 With interpolation, you put the property name in the view template, enclosed in double curly braces: `{{myHero}}`.

-Follow the [Getting Started](guide/quickstart) instructions for creating a new project
+Follow the [quickstart](guide/quickstart) instructions for creating a new project
 named <code>displaying-data</code>.

 Delete the <code>app.component.html</code> file. It is not needed for this example.
--- a/aio/content/guide/forms-overview.md
+++ b/aio/content/guide/forms-overview.md
@ -84,7 +84,7 @@ The abstraction of the form model promotes simplicity over structure. The templa

 ## Data flow in forms

-When building forms in Angular, it's important to understand how the framework handles data flowing from the user or from programmatic changes. Reactive and template-driven forms follow two different strategies when handling form input. The data flow examples below begin with the favorite color input field example from above, and they show how changes to favorite color are handled in reactive forms compared to template-driven forms.
+When building forms in Angular, it's important to understand how the the framework handles data flowing from the user or from programmatic changes. Reactive and template-driven forms follow two different strategies when handling form input. The data flow examples below begin with the favorite color input field example from above, and they show how changes to favorite color are handled in reactive forms compared to template-driven forms.

 ### Data flow in reactive forms

@ -253,7 +253,7 @@ To learn more about reactive forms, see the following guides:
 * [Form Validation](guide/form-validation#reactive-form-validation)
 * [Dynamic forms](guide/dynamic-form)

-To learn more about template-driven forms, see the following guides:
+To learn more about tempate-driven forms, see the following guides:

 * [Template-driven Forms](guide/forms)
 * [Form Validation](guide/form-validation#template-driven-validation)
--- a/aio/content/guide/glossary.md
+++ b/aio/content/guide/glossary.md
@ -77,7 +77,7 @@ A way to initialize and launch an app or system.

 In Angular, an app's root NgModule (`AppModule`) has a `bootstrap` property that identifies the app's top-level [components](guide/glossary#component). 
 During the bootstrap process, Angular creates and inserts these components into the `index.html` host web page.
-You can bootstrap multiple apps in the same `index.html`. Each app contains its own components.
+You can bootstrap multiple apps in the same `index.html`. Each app ccontains its own components.

 Learn more in [Bootstrapping](guide/bootstrapping).

@ -132,7 +132,7 @@ A [decorator](guide/glossary#decorator) statement immediately before a field in

 The [Angular CLI](https://cli.angular.io/) is a command-line tool for managing the Angular development cycle. Use it to create the initial filesystem scaffolding for a [workspace](guide/glossary#workspace) or [project](guide/glossary#project), and to run [schematics](guide/glossary#schematic) that add and modify code for initial generic versions of various elements. The CLI supports all stages of the development cycle, including building, testing, bundling, and deployment.

-* To begin using the CLI for a new project, see [Getting Started](guide/quickstart).
+* To begin using the CLI for a new project, see [QuickStart](guide/quickstart).
 * To learn more about the full capabilities of the CLI, see the [Angular CLI documentation](https://github.com/angular/angular-cli/wiki).

 {@a component}
--- a/aio/content/guide/http.md
+++ b/aio/content/guide/http.md
@ -936,7 +936,7 @@ setting up such mocking straightforward.
 ### Mocking philosophy

 Angular's HTTP testing library is designed for a pattern of testing wherein 
-the app executes code and makes requests first.
+the the app executes code and makes requests first.

 Then a test expects that certain requests have or have not been made, 
 performs assertions against those requests, 
--- a/aio/content/guide/i18n.md
+++ b/aio/content/guide/i18n.md
@ -359,7 +359,7 @@ Pluralization categories include (depending on the language):
 After the pluralization category, put the default English text in braces (`{}`).

 In the example above, the three options are specified according to that pluralization pattern. For
-talking about zero minutes, you use `=0 {just now}`. For one minute, you use `=1 {one minute}`.
+talking about about zero minutes, you use `=0 {just now}`. For one minute, you use `=1 {one minute}`.
 Any unmatched cardinality uses `other {{{minutes}} minutes ago}`. You could choose to add patterns
 for two, three, or any other number if the pluralization rules were different. For the example of
 "minute", only these three patterns are necessary in English.
@ -542,7 +542,7 @@ This sample file is easy to translate without a special editor or knowledge of F


 2. Duplicate the `<source/>` tag, rename it `target`, and then replace its content with the French
-  greeting. If you were working with a more complex translation, you could use the information
+  greeting. If you were working with a more complex translation, you could use the the information
  and context provided by the source, description, and meaning elements to guide your selection of
  the appropriate French translation.

--- a/aio/content/guide/observables.md
+++ b/aio/content/guide/observables.md
@ -1,4 +1,3 @@
-
 # Observables

 Observables provide support for passing messages between publishers and subscribers in your application. Observables offer significant benefits over other techniques for event handling, asynchronous programming, and handling multiple values.
@ -37,10 +36,10 @@ An `Observable` instance begins publishing values only when someone subscribes t

 <div class="alert is-helpful">

-In order to show how subscribing works, we need to create a new observable. There is a constructor that you use to create new instances, but for illustration, we can use some methods from the RxJS library that create simple observables of frequently used types:
+   In order to show how subscribing works, we need to create a new observable. There is a  constructor that you use to create new instances, but for illustration, we can use some static methods on the `Observable` class that create simple observables of frequently used types:

-  * `of(...items)`&mdash;Returns an `Observable` instance that synchronously delivers the values provided as arguments.
-  * `from(iterable)`&mdash;Converts its argument to an `Observable` instance. This method is commonly used to convert an array to an observable.
+  * `Observable.of(...items)`&mdash;Returns an `Observable` instance that synchronously delivers the values provided as arguments.
+  * `Observable.from(iterable)`&mdash;Converts its argument to an `Observable` instance. This method is commonly used to convert an array to an observable.

 </div>

@ -63,7 +62,7 @@ Note that a `next()` function could receive, for instance, message strings, or e

 Use the `Observable` constructor to create an observable stream of any type. The constructor takes as its argument the subscriber function to run when the observable’s `subscribe()` method executes. A subscriber function receives an `Observer` object, and can publish values to the observer's `next()` method.

-For example, to create an observable equivalent to the `of(1, 2, 3)` above, you could do something like this:
+For example, to create an observable equivalent to the `Observable.of(1, 2, 3)` above, you could do something like this:

 <code-example path="observables/src/creating.ts" region="subscriber" title="Create observable with constructor"></code-example>

--- a/aio/content/guide/quickstart.md
+++ b/aio/content/guide/quickstart.md
@ -1,4 +1,4 @@
-# Getting Started
+# QuickStart

 Good tools make application development quicker and easier to maintain than
 if you did everything by hand.
@ -147,7 +147,7 @@ Open `src/app/app.component.css` and give the component some style.


 <figure>
-  <img src='generated/images/guide/cli-quickstart/my-first-app.png' alt="Output of Getting Started app">
+  <img src='generated/images/guide/cli-quickstart/my-first-app.png' alt="Output of QuickStart app">
 </figure>


--- a/aio/content/guide/releases.md
+++ b/aio/content/guide/releases.md
@ -70,7 +70,7 @@ The following table contains our current target release dates for the next two m
 September/October 2018 | 7.0.0          | ^6.0.0
 March/April 2019       | 8.0.0          | ^7.0.0

- Compatibility note: The primary goal of the backward compatibility promise is to ensure that changes in the core framework and tooling don't break the existing ecosystem of components and applications and don't put undue upgrade/migration burden on Angular application and component authors.
+ Compatiblity note: The primary goal of the backwards compatibility promise is to ensure that changes in the core framework and tooling don't break the existing ecosystem of components and applications and don't put undue upgrade/migration burden on Angular application and component authors.


 {@a lts}
--- a/aio/content/guide/router.md
+++ b/aio/content/guide/router.md
@ -3918,7 +3918,7 @@ the `queryParamsHandling` and `preserveFragment` bindings respectively.

 As you've worked through the milestones, the application has naturally gotten larger.
 As you continue to build out feature areas, the overall application size will continue to grow.
-At some point you'll reach a tipping point where the application takes a long time to load.
+At some point you'll reach a tipping point where the application takes long time to load.

 How do you combat this problem?  With asynchronous routing, which loads feature modules _lazily_, on request.
 Lazy loading has multiple benefits.
--- a/aio/content/guide/setup.md
+++ b/aio/content/guide/setup.md
@ -330,7 +330,7 @@ You may need [nvm](https://github.com/creationix/nvm) if you already have projec
 Links on almost every documentation page open completed samples in the browser.
 You can play with the sample code, share your changes with friends, and download and run the code on your own machine.

-The [Getting Started](guide/quickstart "Angular QuickStart Playground") shows just the `AppComponent` file.
+The [QuickStart](guide/quickstart "Angular QuickStart Playground") shows just the `AppComponent` file.
 It creates the equivalent of `app.module.ts` and `main.ts` internally _for the playground only_.
 so the reader can discover Angular without distraction.
 The other samples are based on the QuickStart seed.
@ -356,24 +356,3 @@ If you develop angular locally with `ng serve`, there will be `websocket` connec

 In windows, by default one application can only have 6 websocket connections, <a href="https://msdn.microsoft.com/library/ee330736%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396#websocket_maxconn" title="MSDN WebSocket settings">MSDN WebSocket Settings</a>.
 So if IE was refreshed manunally or automatically by `ng serve`, sometimes, the websocket will not close properly, when websocket connections exceed limitations, `SecurityError` will be thrown, this error will not affect the angular application, you can just restart IE to clear this error, or modify the windows registry to update the limitations.
-
-## Appendix: test using `fakeAsync()/async()`
-
-If you use the `fakeAsync()/async()` helper function to run unit tests (for details, read [testing guide](guide/testing#async-test-with-fakeasync)), you need to import `zone.js/dist/zone-testing` in your test setup file.
-
-<div class="alert is-important">
-If you create project with `Angular/CLI`, it is already imported in `src/test.ts`.
-</div>
-
-And in the earlier versions of `Angular`, the following files were imported or added in your html file:
-
-```
-import 'zone.js/dist/long-stack-trace-zone';
-import 'zone.js/dist/proxy';
-import 'zone.js/dist/sync-test';
-import 'zone.js/dist/jasmine-patch';
-import 'zone.js/dist/async-test';
-import 'zone.js/dist/fake-async-test';
-```
-
-You can still load those files separately, but the order is important, you must import `proxy` before `sync-test`, `async-test`, `fake-async-test` and `jasmine-patch`. And you also need to import `sync-test` before `jasmine-patch`, so it is recommended to just import `zone-testing` instead of loading those separated files.
--- a/aio/content/guide/styleguide.md
+++ b/aio/content/guide/styleguide.md
@ -45,7 +45,7 @@ If you fully understand the meaning behind the guideline and have a good reason



-**Avoid** indicates something you should almost never do. Code examples to *avoid* have an unmistakable red header.
+**Avoid** indicates something you should almost never do. Code examples to *avoid* have an unmistakeable red header.


 </div>
@ -2865,7 +2865,7 @@ and more difficult in a flat structure.



-**Why?** NgModules make it easier to isolate, test, and reuse features.
+**Why?** NgModules make it easier to isolate, test, and re-use features.


 </div>
--- a/aio/content/guide/testing.md
+++ b/aio/content/guide/testing.md
@ -1237,8 +1237,6 @@ value becomes available. The test must become _asynchronous_.

 #### Async test with _fakeAsync()_

-To use `fakeAsync()` functionality, you need to import `zone-testing`, for details, please read [setup guide](guide/setup#appendix-test-using-fakeasyncasync).
-
 The following test confirms the expected behavior when the service returns an `ErrorObservable`.

 <code-example
@ -1252,7 +1250,7 @@ Note that the `it()` function receives an argument of the following form.
 fakeAsync(() => { /* test body */ })`
 ```

-The `fakeAsync()` function enables a linear coding style by running the test body in a special `fakeAsync test zone`.
+The `fakeAsync` function enables a linear coding style by running the test body in a special _fakeAsync test zone_.
 The test body appears to be synchronous.
 There is no nested syntax (like a `Promise.then()`) to disrupt the flow of control.

@ -1265,55 +1263,12 @@ You do have to call `tick()` to advance the (virtual) clock.
 Calling `tick()` simulates the passage of time until all pending asynchronous activities finish.
 In this case, it waits for the error handler's `setTimeout()`;

-The `tick()` function accepts milliseconds as parameter (defaults to 0 if not provided). The parameter represents how much the virtual clock advances. For example, if you have a `setTimeout(fn, 100)` in a `fakeAsync()` test, you need to use tick(100) to trigger the fn callback.
-
-<code-example
-  path="testing/src/app/demo/async-helper.spec.ts"
-  region="fake-async-test-tick">
-</code-example>
-
-The `tick()` function is one of the Angular testing utilities that you import with `TestBed`.
-It's a companion to `fakeAsync()` and you can only call it within a `fakeAsync()` body.
-
-#### Comparing dates inside fakeAsync()
-
-`fakeAsync()` simulates passage of time, which allows you to calculate the difference between dates inside `fakeAsync()`.
-
-<code-example
-  path="testing/src/app/demo/async-helper.spec.ts"
-  region="fake-async-test-date">
-</code-example>
-
-#### jasmine.clock with fakeAsync()
-
-Jasmine also provides a `clock` feature to mock dates. Angular automatically runs tests that are run after
-`jasmine.clock().install()` is called inside a `fakeAsync()` method until `jasmine.clock().uninstall()` is called. `fakeAsync()` is not needed and throws an error if nested.
-
-By default, this feature is disabled. To enable it, set a global flag before import `zone-testing`.
-
-If you use the Angular CLI, configure this flag in `src/test.ts`.
-
-```
-(window as any)['__zone_symbol__fakeAsyncPatchLock'] = true;
-import 'zone.js/dist/zone-testing';
-```
-
-<code-example
-  path="testing/src/app/demo/async-helper.spec.ts"
-  region="fake-async-test-clock">
-</code-example>
-
-#### Using the RxJS scheduler inside fakeAsync()
-
-You can also use RxJS scheduler in `fakeAsync()` just like using `setTimeout()` or `setInterval()`, but you need to import `zone.js/dist/zone-patch-rxjs-fake-async` to patch RxJS scheduler.
-<code-example
-  path="testing/src/app/demo/async-helper.spec.ts"
-  region="fake-async-test-rxjs">
-</code-example>
+The `tick` function is one of the Angular testing utilities that you import with `TestBed`.
+It's a companion to `fakeAsync` and you can only call it within a `fakeAsync` body.

 #### Support more macroTasks

-By default `fakeAsync()` supports the following `macroTasks`.
+By default `fakeAsync` supports the following `macroTasks`.

 - setTimeout
 - setInterval
@ -1334,7 +1289,7 @@ If you run other `macroTask` such as `HTMLCanvasElement.toBlob()`, `Unknown macr
  </code-pane>
 </code-tabs>

-If you want to support such case, you need to define the `macroTask` you want to support in `beforeEach()`.
+If you want to support such case, you need to define the `macroTask` you want to support in `beforeEach`.
 For example:

 ```javascript
@ -1431,8 +1386,6 @@ Then you can assert that the quote element displays the expected text.

 #### Async test with _async()_

-To use `async()` functionality, you need to import `zone-testing`, for details, please read [setup guide](guide/setup#appendix-test-using-fakeasyncasync).
-
 The `fakeAsync()` utility function has a few limitations.
 In particular, it won't work if the test body makes an `XHR` call.

@ -1456,13 +1409,12 @@ Here's the previous `fakeAsync()` test, re-written with the `async()` utility.

 The `async()` utility hides some asynchronous boilerplate by arranging for the tester's code
 to run in a special _async test zone_.
-You don't need to pass Jasmine's `done()` into the test and call `done()` because it is `undefined` in promise or observable callbacks.
+You don't have to pass Jasmine's `done()` into the test and call `done()`
+in promise or observable callbacks.

 But the test's asynchronous nature is revealed by the call to `fixture.whenStable()`,
 which breaks the linear flow of control.

-When using an `intervalTimer()` such as `setInterval()` in `async()`, remember to cancel the timer with `clearInterval()` after the test, otherwise the `async()` never ends.
-
 {@a when-stable}

 #### _whenStable_
@ -1481,19 +1433,18 @@ update the quote element with the expected text.

 #### Jasmine _done()_

-While the `async()` and `fakeAsync()` functions greatly
+While the `async` and `fakeAsync` functions greatly
 simplify Angular asynchronous testing,
 you can still fall back to the traditional technique
 and pass `it` a function that takes a
 [`done` callback](http://jasmine.github.io/2.0/introduction.html#section-Asynchronous_Support).

-You can't call `done()` in `async()` or `fakeAsync()` functions, because the `done parameter`
-is `undefined`.
-
 Now you are responsible for chaining promises, handling errors, and calling `done()` at the appropriate moments.

-Writing test functions with `done()`, is more cumbersome than `async()`and `fakeAsync()`.
-But it is occasionally necessary when code involves the `intervalTimer()` like `setInterval`.
+Writing test functions with `done()`, is more cumbersome than `async`and `fakeAsync`.
+But it is occasionally necessary.
+For example, you can't call `async` or `fakeAsync` when testing
+code that involves the `intervalTimer()` or the RxJS `delay()` operator.

 Here are two more versions of the previous test, written with `done()`.
 The first one subscribes to the `Observable` exposed to the template by the component's `quote` property.
@ -2356,6 +2307,7 @@ Here are a few more `HeroDetailComponent` tests to reinforce the point.

 {@a compile-components}
 ### Calling _compileComponents()_
+
 <div class="alert is-helpful">

 You can ignore this section if you _only_ run tests with the CLI `ng test` command
@ -2919,7 +2871,7 @@ Here's a summary of the stand-alone functions, in order of likely utility:

    <td>

-      When a `fakeAsync()` test ends with pending timer event _tasks_ (queued `setTimeOut` and `setInterval` callbacks),
+      When a `fakeAsync` test ends with pending timer event _tasks_ (queued `setTimeOut` and `setInterval` callbacks),
      the test fails with a clear error message.

      In general, a test should end with no queued tasks.
@ -2936,7 +2888,7 @@ Here's a summary of the stand-alone functions, in order of likely utility:

    <td>

-      When a `fakeAsync()` test ends with pending _micro-tasks_ such as unresolved promises,
+      When a `fakeAsync` test ends with pending _micro-tasks_ such as unresolved promises,
      the test fails with a clear error message.

      In general, a test should wait for micro-tasks to finish.
--- a/aio/content/guide/transition-and-triggers.md
+++ b/aio/content/guide/transition-and-triggers.md
@ -255,7 +255,7 @@ You can combine keyframes with `duration`, `delay`, and `easing` within a single

 ### Keyframes with a pulsation

-Use keyframes to create a pulse effect in your animations by defining styles at specific offset throughout the animation.
+Use ketframes to create a pulse effect in your animations by defining styles at specific offset throughout the animation.

 Here's an example of using keyframes to create a pulse effect:

@ -305,4 +305,4 @@ You may also be interested in the following:
 * [Introduction to Angular animations](guide/animations)
 * [Complex animation sequences](guide/complex-animation-sequences)
 * [Reusable animations](guide/reusable-animations)
-* [Route transition animations](guide/route-animations)
+* [Route transition animations](guide/route-animations)
--- a/aio/content/images/bios/lacolaco.jpg
+++ b/aio/content/images/bios/lacolaco.jpg
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@ -671,14 +671,5 @@
    "website": "https://sajeetharan.herokuapp.com/",
    "bio": "Sajeetharan is a Developer, Top contributor on stackoverflow for #Angular, ng-SriLanka organizer. He makes use of his extensive knowledge over the past years to contribute to community to make the world a better place.",
    "group": "GDE"
-  },
-
-  "lacolaco": {
-    "name": "Suguru Inatomi",
-    "picture": "lacolaco.jpg",
-    "twitter": "laco2net",
-    "website": "https://lacolaco.net",
-    "bio": "Suguru is a community-loving Frontend developer and a lead of Angular Japan User Group. He organizes the largest Angular event in Japan (ng-japan). And he is a contributor to Angular by sending patches, writing, speaking, and localizing resources in Japanese.",
-    "group": "GDE"
  }
 }
--- a/aio/content/marketing/docs.md
+++ b/aio/content/marketing/docs.md
@ -10,9 +10,9 @@ Angular is a platform that makes it easy to build applications with the web. Ang
      <p class="card-footer">Angular in Action</p>
  </a>

-  <a href="guide/quickstart" class="docs-card" title="Angular Getting Started">
+  <a href="guide/quickstart" class="docs-card" title="Angular Quickstart">
      <section>Get Going with Angular</section>
-      <p>Get going on your own environment with the Getting Started.</p>
+      <p>Get going on your own environment with the Quickstart.</p>
      <p class="card-footer">Quickstart</p>
  </a>

--- a/aio/content/tutorial/toh-pt6.md
+++ b/aio/content/tutorial/toh-pt6.md
@ -208,7 +208,7 @@ innocuous result so that the application keeps working.

 #### _handleError_

-The following `handleError()` will be shared by many `HeroService` methods
+The following `errorHandler()` will be shared by many `HeroService` methods
 so it's generalized to meet their different needs.

 Instead of handling the error directly, it returns an _error handler_ function to `catchError` that it 
@ -223,7 +223,7 @@ After reporting the error to console, the handler constructs
 a user friendly message and returns a safe value to the app so it can keep working.

 Because each service method returns a different kind of `Observable` result,
-`handleError()` takes a type parameter so it can return the safe value as the type that the app expects.
+`errorHandler()` takes a type parameter so it can return the safe value as the type that the app expects.

 ### Tap into the _Observable_

--- a/aio/package.json
+++ b/aio/package.json
@ -30,8 +30,8 @@
    "setup-local": "yarn aio-use-local && yarn example-use-local",
    "postsetup-local": "yarn postsetup",
    "set-opensearch-url": "node --eval \"const sh = require('shelljs'); sh.set('-e'); sh.sed('-i', /PLACEHOLDER_URL/g, process.argv[1], 'dist/assets/opensearch.xml');\"",
+    "test-pwa-score-localhost": "concurrently --kill-others --success first \"http-server dist -p 4200 --silent\" \"yarn test-pwa-score http://localhost:4200 90\"",
    "test-pwa-score": "node scripts/test-pwa-score",
-    "test-pwa-score-localhost": "run-p --race \"~~http-server dist -p 4200 --silent\" \"test-pwa-score http://localhost:4200 {1}\" --",
    "example-e2e": "yarn example-check-local && node ./tools/examples/run-example-e2e",
    "example-lint": "tslint -c \"content/examples/tslint.json\" \"content/examples/**/*.ts\" -e \"content/examples/styleguide/**/*.avoid.ts\"",
    "example-use-local": "node tools/ng-packages-installer overwrite ./tools/examples/shared --debug",
@ -52,7 +52,7 @@
    "tools-lint": "tslint -c \"tools/tslint.json\" \"tools/firebase-test-utils/**/*.ts\"",
    "tools-test": "./scripts/deploy-to-firebase.test.sh && yarn docs-test && yarn boilerplate:test && jasmine tools/ng-packages-installer/index.spec.js && yarn firebase-utils-test",
    "preserve-and-sync": "yarn docs",
-    "serve-and-sync": "run-p \"start\" \"docs-watch --watch-only\"",
+    "serve-and-sync": "concurrently --kill-others \"yarn docs-watch --watch-only\" \"yarn start\"",
    "boilerplate:add": "node ./tools/examples/example-boilerplate add",
    "boilerplate:remove": "node ./tools/examples/example-boilerplate remove",
    "boilerplate:test": "node tools/examples/test.js",
@ -64,8 +64,7 @@
    "~~check-env": "node scripts/check-environment",
    "~~clean-generated": "node --eval \"require('shelljs').rm('-rf', 'src/generated')\"",
    "~~build": "ng build",
-    "post~~build": "yarn build-404-page",
-    "~~http-server": "http-server"
+    "post~~build": "yarn build-404-page"
  },
  "engines": {
    "node": ">=10.9.0 <11.0.0",
@ -73,17 +72,17 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "^7.0.0-rc.0",
+    "@angular/animations": "^7.0.0-beta.7",
    "@angular/cdk": "6.0.2",
-    "@angular/common": "^7.0.0-rc.0",
-    "@angular/core": "^7.0.0-rc.0",
-    "@angular/elements": "^7.0.0-rc.0",
-    "@angular/forms": "^7.0.0-rc.0",
+    "@angular/common": "^7.0.0-beta.7",
+    "@angular/core": "^7.0.0-beta.7",
+    "@angular/elements": "^7.0.0-beta.7",
+    "@angular/forms": "^7.0.0-beta.7",
    "@angular/material": "6.0.2",
-    "@angular/platform-browser": "^7.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "^7.0.0-rc.0",
-    "@angular/router": "^7.0.0-rc.0",
-    "@angular/service-worker": "^7.0.0-rc.0",
+    "@angular/platform-browser": "^7.0.0-beta.7",
+    "@angular/platform-browser-dynamic": "^7.0.0-beta.7",
+    "@angular/router": "^7.0.0-beta.7",
+    "@angular/service-worker": "^7.0.0-beta.7",
    "@webcomponents/custom-elements": "^1.2.0",
    "classlist.js": "^1.1.20150312",
    "core-js": "^2.4.1",
@ -95,9 +94,9 @@
  "devDependencies": {
    "@angular-devkit/build-angular": "^0.8.3",
    "@angular/cli": "^6.2.3",
-    "@angular/compiler": "^7.0.0-rc.0",
-    "@angular/compiler-cli": "^7.0.0-rc.0",
-    "@angular/language-service": "^7.0.0-rc.0",
+    "@angular/compiler": "^7.0.0-beta.7",
+    "@angular/compiler-cli": "^7.0.0-beta.7",
+    "@angular/language-service": "^7.0.0-beta.7",
    "@types/jasmine": "^2.5.52",
    "@types/jasminewd2": "^2.0.3",
    "@types/node": "~6.0.60",
@ -106,6 +105,7 @@
    "chalk": "^2.1.0",
    "cjson": "^0.5.0",
    "codelyzer": "~4.2.1",
+    "concurrently": "^3.4.0",
    "cross-spawn": "^5.1.0",
    "css-selector-parser": "^1.3.0",
    "dgeni": "^0.4.7",
@ -139,7 +139,6 @@
    "lighthouse": "^2.5.0",
    "lodash": "^4.17.4",
    "lunr": "^2.1.0",
-    "npm-run-all": "^4.1.3",
    "protractor": "^5.2.0",
    "rehype": "^4.0.0",
    "rehype-slug": "^2.0.0",
@ -151,7 +150,7 @@
    "tree-kill": "^1.1.0",
    "ts-node": "^3.3.0",
    "tslint": "~5.9.1",
-    "typescript": "^3.1.1",
+    "typescript": "3.0",
    "uglify-js": "^3.0.15",
    "unist-util-filter": "^0.2.1",
    "unist-util-source": "^1.0.1",
@ -159,8 +158,8 @@
    "unist-util-visit-parents": "^1.1.1",
    "vrsource-tslint-rules": "^5.8.2",
    "watchr": "^3.0.1",
-    "webpack-cli": "^3.1.2",
+    "webpack-cli": "^2.0.14",
    "xregexp": "^4.0.0",
    "yargs": "^7.0.2"
  }
-}
+}
--- a/aio/scripts/_payload-limits.json
+++ b/aio/scripts/_payload-limits.json
@ -3,7 +3,7 @@
    "master": {
      "uncompressed": {
        "runtime": 3173,
-        "main": 483844,
+        "main": 483686,
        "polyfills": 53920,
        "prettify": 14913
      }
--- a/aio/scripts/test-production.sh
+++ b/aio/scripts/test-production.sh
@ -6,7 +6,7 @@ set +x -eu -o pipefail
  readonly aioDir="$(realpath $thisDir/..)"

  readonly protractorConf="$aioDir/tests/deployment/e2e/protractor.conf.js"
-  readonly minPwaScore="$1"
+  readonly minPwaScore="95"
  readonly urls=(
    "https://angular.io/"
    "https://next.angular.io/"
--- a/aio/src/app/custom-elements/contributor/contributor.service.spec.ts
+++ b/aio/src/app/custom-elements/contributor/contributor.service.spec.ts
@ -44,7 +44,7 @@ describe('ContributorService', () => {
    it('contributors observable should complete', () => {
      let completed = false;
      contribService.contributors.subscribe(undefined, undefined, () => completed = true);
-      expect(completed).toBe(true, 'observable completed');
+      expect(true).toBe(true, 'observable completed');
    });

    it('should reshape the contributor json to expected result', () => {
--- a/aio/src/app/custom-elements/resource/resource.service.spec.ts
+++ b/aio/src/app/custom-elements/resource/resource.service.spec.ts
@ -44,7 +44,7 @@ describe('ResourceService', () => {
    it('categories observable should complete', () => {
      let completed = false;
      resourceService.categories.subscribe(undefined, undefined, () => completed = true);
-      expect(completed).toBe(true, 'observable completed');
+      expect(true).toBe(true, 'observable completed');
    });

    it('should reshape contributors.json to sorted category array', () => {
--- a/aio/src/app/custom-elements/toc/toc.component.spec.ts
+++ b/aio/src/app/custom-elements/toc/toc.component.spec.ts
@ -138,6 +138,9 @@ describe('TocComponent', () => {
      });

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

--- a/aio/src/app/documents/document.service.spec.ts
+++ b/aio/src/app/documents/document.service.spec.ts
@ -180,8 +180,10 @@ describe('DocumentService', () => {

  describe('computeMap', () => {
    it('should map the "empty" location to the correct document request', () => {
+      let latestDocument: DocumentContents;
      const { docService } = getServices();
-      docService.currentDocument.subscribe();
+
+      docService.currentDocument.subscribe(doc => latestDocument = doc);

      httpMock.expectOne(CONTENT_URL_PREFIX + 'index.json');
    });
--- a/aio/src/app/navigation/navigation.service.spec.ts
+++ b/aio/src/app/navigation/navigation.service.spec.ts
@ -2,9 +2,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { Injector } from '@angular/core';
 import { TestBed } from '@angular/core/testing';

-import {
-  CurrentNodes, NavigationNode, navigationPath, NavigationService, NavigationViews, VersionInfo,
-} from 'app/navigation/navigation.service';
+import { CurrentNodes, NavigationService, NavigationViews, NavigationNode, VersionInfo } from 'app/navigation/navigation.service';
 import { LocationService } from 'app/shared/location.service';
 import { MockLocationService } from 'testing/location.service';

@ -48,9 +46,10 @@ describe('NavigationService', () => {
    it('navigationViews observable should complete', () => {
      let completed = false;
      navService.navigationViews.subscribe(undefined, undefined, () => completed = true);
+      expect(true).toBe(true, 'observable completed');

-      httpMock.expectOne({method: 'get', url: navigationPath}).flush({});
-      expect(completed).toBe(true, 'observable completed');
+      // Stop `$httpMock.verify()` from complaining.
+      httpMock.expectOne({});
    });

    it('should return the same object to all subscribers', () => {
--- a/aio/src/app/navigation/navigation.service.ts
+++ b/aio/src/app/navigation/navigation.service.ts
@ -11,7 +11,7 @@ import { CONTENT_URL_PREFIX } from 'app/documents/document.service';
 import { CurrentNodes, NavigationNode, NavigationResponse, NavigationViews, VersionInfo } from './navigation.model';
 export { CurrentNodes, CurrentNode, NavigationNode, NavigationResponse, NavigationViews, VersionInfo } from './navigation.model';

-export const navigationPath = CONTENT_URL_PREFIX + 'navigation.json';
+const navigationPath = CONTENT_URL_PREFIX + 'navigation.json';

@Injectable()
 export class NavigationService {
--- a/aio/src/app/shared/copier.service.ts
+++ b/aio/src/app/shared/copier.service.ts
@ -16,8 +16,7 @@ export class CopierService {
     * and makes a selection on it.
     */
    createFake(text: string) {
-      const docElem = document.documentElement!;
-      const isRTL = docElem.getAttribute('dir') === 'rtl';
+      const isRTL = document.documentElement.getAttribute('dir') === 'rtl';

      // Create a fake element to hold the contents to copy
      this.fakeElem = document.createElement('textarea');
@ -35,7 +34,7 @@ export class CopierService {
      this.fakeElem.style[ isRTL ? 'right' : 'left' ] = '-9999px';

      // Move element to the same position vertically
-      const yPosition = window.pageYOffset || docElem.scrollTop;
+      const yPosition = window.pageYOffset || document.documentElement.scrollTop;
      this.fakeElem.style.top = yPosition + 'px';

      this.fakeElem.setAttribute('readonly', '');
--- a/aio/src/index.html
+++ b/aio/src/index.html
@ -91,7 +91,7 @@

  <noscript>
    <div class="background-sky hero"></div>
-    <section id="intro" style="text-shadow: 1px 1px #1976d2;">
+    <section id="intro">
      <div class="hero-logo">
        <img src="assets/images/logos/angular/angular.svg" width="250" height="250">
      </div>
@ -99,7 +99,7 @@
        <div class="hero-headline">One framework.<br>Mobile &amp; desktop.</div>
      </div>
    </section>
-    <h2 style="color: red; margin-top: 40px; position: relative; text-align: center; text-shadow: 1px 1px #fafafa;">
+    <h2 style="color: red; text-align: center; margin-top: -50px;">
      <b><i>This website requires JavaScript.</i></b>
    </h2>
  </noscript>
--- a/aio/tools/examples/shared/boilerplate/cli/.gitignore
+++ b/aio/tools/examples/shared/boilerplate/cli/.gitignore
@ -30,9 +30,13 @@
 /coverage
 /libpeerconnection.log
 npm-debug.log
-yarn-error.log
 testem.log
 /typings
+yarn-error.log
+
+# e2e
+/e2e/*.js
+/e2e/*.map

 # System Files
 .DS_Store
--- a/aio/tools/examples/shared/boilerplate/cli/angular.json
+++ b/aio/tools/examples/shared/boilerplate/cli/angular.json
@ -1,14 +1,12 @@
 {
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
  "version": 1,
  "newProjectRoot": "projects",
  "projects": {
    "angular.io-example": {
      "root": "",
-      "sourceRoot": "src",
      "projectType": "application",
      "prefix": "app",
-      "schematics": {},
      "architect": {
        "build": {
          "builder": "@angular-devkit/build-angular:browser",
@ -19,11 +17,21 @@
            "polyfills": "src/polyfills.ts",
            "tsConfig": "src/tsconfig.app.json",
            "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "favicon.ico",
+                "input": "src",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              }
            ],
            "styles": [
-              "src/styles.css"
+              {
+                "input": "src/styles.css"
+              }
            ],
            "scripts": []
          },
@ -43,14 +51,7 @@
              "aot": true,
              "extractLicenses": true,
              "vendorChunk": false,
-              "buildOptimizer": true,
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "2mb",
-                  "maximumError": "5mb"
-                }
-              ]
+              "buildOptimizer": true
            }
          }
        },
@ -79,12 +80,22 @@
            "tsConfig": "src/tsconfig.spec.json",
            "karmaConfig": "src/karma.conf.js",
            "styles": [
-              "src/styles.css"
+              {
+                "input": "styles.css"
+              }
            ],
            "scripts": [],
            "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "favicon.ico",
+                "input": "src/",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              }
            ]
          }
        },
@ -105,18 +116,12 @@
    "angular.io-example-e2e": {
      "root": "e2e/",
      "projectType": "application",
-      "prefix": "",
      "architect": {
        "e2e": {
          "builder": "@angular-devkit/build-angular:protractor",
          "options": {
            "protractorConfig": "e2e/protractor.conf.js",
            "devServerTarget": "angular.io-example:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "angular.io-example:serve:production"
-            }
          }
        },
        "lint": {
@ -130,6 +135,5 @@
        }
      }
    }
-  },
-  "defaultProject": "angular.io-example"
-}
+  }
+}
--- a/aio/tools/examples/shared/boilerplate/cli/e2e/protractor.conf.js
+++ b/aio/tools/examples/shared/boilerplate/cli/e2e/protractor.conf.js
@ -6,7 +6,7 @@ const { SpecReporter } = require('jasmine-spec-reporter');
 exports.config = {
  allScriptsTimeout: 11000,
  specs: [
-    './src/**/*.e2e-spec.ts'
+    './**/*.e2e-spec.ts'
  ],
  capabilities: {
    'browserName': 'chrome',
@ -26,8 +26,8 @@ exports.config = {
  },
  onPrepare() {
    require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.e2e.json')
+      project: 'e2e/tsconfig.e2e.json'
    });
    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
  }
-};
+};
--- a/aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.e2e.json
+++ b/aio/tools/examples/shared/boilerplate/cli/e2e/tsconfig.e2e.json
@ -1,7 +1,8 @@
 {
  "extends": "../tsconfig.json",
  "compilerOptions": {
-    "outDir": "../out-tsc/app",
+    "outDir": "../out-tsc/e2e",
+    "baseUrl": "./",
    "module": "commonjs",
    "target": "es5",
    "types": [
--- a/aio/tools/examples/shared/boilerplate/cli/package.json
+++ b/aio/tools/examples/shared/boilerplate/cli/package.json
@ -5,48 +5,48 @@
  "scripts": {
    "ng": "ng",
    "start": "ng serve",
-    "build": "ng build",
+    "build": "ng build --prod",
    "test": "ng test",
    "lint": "ng lint",
    "e2e": "ng e2e"
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "~7.0.0-rc.0",
-    "@angular/common": "~7.0.0-rc.0",
-    "@angular/compiler": "~7.0.0-rc.0",
-    "@angular/core": "~7.0.0-rc.0",
-    "@angular/forms": "~7.0.0-rc.0",
-    "@angular/http": "~7.0.0-rc.0",
-    "@angular/platform-browser": "~7.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "~7.0.0-rc.0",
-    "@angular/router": "~7.0.0-rc.0",
+    "@angular/animations": "^6.0.0",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/forms": "^6.0.0",
+    "@angular/http": "^6.0.0",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
+    "@angular/router": "^6.0.0",
    "angular-in-memory-web-api": "^0.6.0",
    "core-js": "^2.5.4",
-    "rxjs": "^6.3.0",
+    "rxjs": "^6.0.0",
    "web-animations-js": "^2.3.1",
-    "zone.js": "~0.8.26"
+    "zone.js": "^0.8.24"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "~0.9.0-rc.2",
-    "@angular/cli": "~7.0.0-rc.2",
-    "@angular/compiler-cli": "~7.0.0-rc.0",
-    "@angular/language-service": "~7.0.0-rc.0",
-    "@types/jasmine": "~2.8.8",
+    "@angular/compiler-cli": "^6.0.0",
+    "@angular-devkit/build-angular": "~0.6.0",
+    "typescript": "~2.7.2",
+    "@angular/cli": "^6.0.0",
+    "@angular/language-service": "^6.0.0",
+    "@types/jasmine": "~2.8.6",
    "@types/jasminewd2": "~2.0.3",
    "@types/node": "~8.9.4",
-    "codelyzer": "~4.3.0",
+    "codelyzer": "~4.2.1",
    "jasmine-core": "~2.99.1",
-    "jasmine-marbles": "^0.4.0",
+    "jasmine-marbles": "^0.3.1",
    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.0.0",
+    "karma": "~2.0.0",
    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
+    "karma-coverage-istanbul-reporter": "~1.4.2",
+    "karma-jasmine": "~1.1.1",
    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.4.0",
-    "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.1.1"
+    "protractor": "~5.3.0",
+    "ts-node": "~5.0.1",
+    "tslint": "~5.9.1"
  }
 }
--- a/aio/tools/examples/shared/boilerplate/cli/src/browserslist
+++ b/aio/tools/examples/shared/boilerplate/cli/src/browserslist
@ -1,11 +1,5 @@
-# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-#
-# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
-
 > 0.5%
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11
+IE 9-11
--- a/aio/tools/examples/shared/boilerplate/cli/src/environments/environment.ts
+++ b/aio/tools/examples/shared/boilerplate/cli/src/environments/environment.ts
@ -7,10 +7,9 @@ export const environment = {
 };

 /*
- * For easier debugging in development mode, you can import the following file
- * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
- *
- * This import should be commented out in production mode because it will have a negative impact
- * on performance if an error is thrown.
+ * In development mode, to ignore zone related error stack frames such as
+ * `zone.run`, `zoneDelegate.invokeTask` for easier debugging, you can
+ * import the following file, but please comment it out in production mode
+ * because it will have performance impact when throw error
 */
 // import 'zone.js/dist/zone-error';  // Included with Angular CLI.
--- a/aio/tools/examples/shared/boilerplate/cli/src/karma.conf.js
+++ b/aio/tools/examples/shared/boilerplate/cli/src/karma.conf.js
@ -16,10 +16,13 @@ module.exports = function (config) {
      clearContext: false // leave Jasmine Spec Runner output visible in browser
    },
    coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, '../coverage'),
+      dir: require('path').join(__dirname, 'coverage'),
      reports: ['html', 'lcovonly'],
      fixWebpackSourcePaths: true
    },
+    angularCli: {
+      environment: 'dev'
+    },
    reporters: ['progress', 'kjhtml'],
    port: 9876,
    colors: true,
@ -28,4 +31,4 @@ module.exports = function (config) {
    browsers: ['Chrome'],
    singleRun: false
  });
-};
+};
--- a/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts
+++ b/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts
@ -11,7 +11,7 @@
 * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
 * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
 *
- * Learn more in https://angular.io/guide/browser-support
+ * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
 */

 /***************************************************************************************************
@ -34,32 +34,23 @@
 // import 'core-js/es6/weak-map';
 // import 'core-js/es6/set';

-/**
- * If the application will be indexed by Google Search, the following is required.
- * Googlebot uses a renderer based on Chrome 41.
- * https://developers.google.com/search/docs/guides/rendering
- **/
-// import 'core-js/es6/array';
-
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.

 /** IE10 and IE11 requires the following for the Reflect API. */
-/**
- * DO NOT REMOVE
- * By default, Reflect polyfills are auto-included by the CLI and
- * are required for JIT compilation.  StackBlitz examples are
- * compiled using JIT.
- */
-import 'core-js/es6/reflect';
+// import 'core-js/es6/reflect';
+
+
+/** Evergreen browsers require these. **/
+// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
 import 'core-js/es7/reflect';

+
 /**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
+ * Required to support Web Animations `@angular/platform-browser/animations`.
+ * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
 **/
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+// import 'web-animations-js';

 /**
 * By default, zone.js will patch all possible macroTask and DomEvents
--- a/aio/tools/examples/shared/boilerplate/cli/src/tsconfig.app.json
+++ b/aio/tools/examples/shared/boilerplate/cli/src/tsconfig.app.json
@ -2,10 +2,13 @@
  "extends": "../tsconfig.json",
  "compilerOptions": {
    "outDir": "../out-tsc/app",
+    "baseUrl": "./",
+    "module": "es2015",
    "types": []
  },
  "exclude": [
    "test.ts",
-    "**/*.spec.ts"
+    "**/*.spec.ts",
+    "**/testing/*"
  ]
 }
--- a/aio/tools/examples/shared/boilerplate/cli/src/tsconfig.spec.json
+++ b/aio/tools/examples/shared/boilerplate/cli/src/tsconfig.spec.json
@ -2,6 +2,9 @@
  "extends": "../tsconfig.json",
  "compilerOptions": {
    "outDir": "../out-tsc/spec",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "target": "es5",
    "types": [
      "jasmine",
      "node"
--- a/aio/tools/examples/shared/boilerplate/cli/tsconfig.json
+++ b/aio/tools/examples/shared/boilerplate/cli/tsconfig.json
@ -1,20 +1,19 @@
 {
  "compileOnSave": false,
  "compilerOptions": {
-    "baseUrl": "./",
    "outDir": "./dist/out-tsc",
    "sourceMap": true,
    "declaration": false,
-    "module": "es2015",
    "moduleResolution": "node",
    "emitDecoratorMetadata": true,
    "experimentalDecorators": true,
    "target": "es5",
+    "skipLibCheck": true,
    "typeRoots": [
      "node_modules/@types"
    ],
    "lib": [
-      "es2018",
+      "es2017",
      "dom"
    ]
  }
--- a/aio/tools/examples/shared/boilerplate/cli/tslint.json
+++ b/aio/tools/examples/shared/boilerplate/cli/tslint.json
@ -18,6 +18,7 @@
    "forin": true,
    "import-blacklist": [
      true,
+      "rxjs",
      "rxjs/Rx"
    ],
    "import-spacing": true,
@ -65,7 +66,6 @@
    ],
    "no-misused-new": true,
    "no-non-null-assertion": true,
-    "no-redundant-jsdoc": true,
    "no-shadowed-variable": true,
    "no-string-literal": false,
    "no-string-throw": true,
@ -107,6 +107,7 @@
        "variable-declaration": "nospace"
      }
    ],
+    "typeof-compare": true,
    "unified-signatures": true,
    "variable-name": false,
    "whitespace": [
@ -117,6 +118,18 @@
      "check-separator",
      "check-type"
    ],
+    "directive-selector": [
+      true,
+      "attribute",
+      "app",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "app",
+      "kebab-case"
+    ],
    "no-output-on-prefix": true,
    "use-input-property-decorator": true,
    "use-output-property-decorator": true,
--- a/aio/tools/examples/shared/boilerplate/i18n/angular.json
+++ b/aio/tools/examples/shared/boilerplate/i18n/angular.json
@ -1,14 +1,12 @@
 {
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
  "version": 1,
  "newProjectRoot": "projects",
  "projects": {
    "angular.io-example": {
      "root": "",
-      "sourceRoot": "src",
      "projectType": "application",
      "prefix": "app",
-      "schematics": {},
      "architect": {
        "build": {
          "builder": "@angular-devkit/build-angular:browser",
@ -19,11 +17,21 @@
            "polyfills": "src/polyfills.ts",
            "tsConfig": "src/tsconfig.app.json",
            "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "favicon.ico",
+                "input": "src",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              }
            ],
            "styles": [
-              "src/styles.css"
+              {
+                "input": "src/styles.css"
+              }
            ],
            "scripts": []
          },
@ -105,12 +113,22 @@
            "tsConfig": "src/tsconfig.spec.json",
            "karmaConfig": "src/karma.conf.js",
            "styles": [
-              "src/styles.css"
+              {
+                "input": "styles.css"
+              }
            ],
            "scripts": [],
            "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "favicon.ico",
+                "input": "src/",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              }
            ]
          }
        },
@ -131,18 +149,12 @@
    "angular.io-example-e2e": {
      "root": "e2e/",
      "projectType": "application",
-      "prefix": "",
      "architect": {
        "e2e": {
          "builder": "@angular-devkit/build-angular:protractor",
          "options": {
            "protractorConfig": "e2e/protractor.conf.js",
            "devServerTarget": "angular.io-example:serve:fr"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "angular.io-example:serve:production"
-            }
          }
        },
        "lint": {
@ -156,6 +168,5 @@
        }
      }
    }
-  },
-  "defaultProject": "angular.io-example"
-}
+  }
+}
--- a/aio/tools/examples/shared/boilerplate/i18n/package.json
+++ b/aio/tools/examples/shared/boilerplate/i18n/package.json
@ -6,7 +6,7 @@
    "ng": "ng",
    "start": "ng serve",
    "start:fr": "ng serve --configuration=fr",
-    "build": "ng build",
+    "build": "ng build --prod",
    "build:fr": "ng build --configuration=production-fr",
    "test": "ng test",
    "lint": "ng lint",
@ -15,41 +15,40 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "~7.0.0-rc.0",
-    "@angular/common": "~7.0.0-rc.0",
-    "@angular/compiler": "~7.0.0-rc.0",
-    "@angular/core": "~7.0.0-rc.0",
-    "@angular/forms": "~7.0.0-rc.0",
-    "@angular/http": "~7.0.0-rc.0",
-    "@angular/platform-browser": "~7.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "~7.0.0-rc.0",
-    "@angular/router": "~7.0.0-rc.0",
-    "angular-in-memory-web-api": "^0.6.0",
+    "@angular/animations": "^6.0.0",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/forms": "^6.0.0",
+    "@angular/http": "^6.0.0",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
+    "@angular/router": "^6.0.0",
    "core-js": "^2.5.4",
-    "rxjs": "^6.3.0",
-    "web-animations-js": "^2.3.1",
-    "zone.js": "~0.8.26"
+    "rxjs": "^6.0.0",
+    "zone.js": "^0.8.24"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "~0.9.0-rc.2",
-    "@angular/cli": "~7.0.0-rc.2",
-    "@angular/compiler-cli": "~7.0.0-rc.0",
-    "@angular/language-service": "~7.0.0-rc.0",
-    "@types/jasmine": "~2.8.8",
+    "@angular/compiler-cli": "^6.0.0",
+    "@angular-devkit/build-angular": "~0.6.0",
+    "@angular/cli": "^6.0.0",
+    "@angular/language-service": "^6.0.0",
+    "@angular/platform-server": "^6.0.0",
+    "@types/jasmine": "~2.8.6",
    "@types/jasminewd2": "~2.0.3",
    "@types/node": "~8.9.4",
-    "codelyzer": "~4.3.0",
+    "codelyzer": "~4.2.1",
    "jasmine-core": "~2.99.1",
-    "jasmine-marbles": "^0.4.0",
+    "jasmine-marbles": "^0.3.1",
    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.0.0",
+    "karma": "~2.0.0",
    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
+    "karma-coverage-istanbul-reporter": "~1.4.2",
+    "karma-jasmine": "~1.1.1",
    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.4.0",
-    "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.1.1"
+    "protractor": "~5.3.0",
+    "ts-node": "~5.0.1",
+    "tslint": "~5.9.1",
+    "typescript": "~2.7.2"
  }
 }
--- a/aio/tools/examples/shared/boilerplate/testing/angular.json
+++ b/aio/tools/examples/shared/boilerplate/testing/angular.json
@ -1,14 +1,12 @@
 {
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
  "version": 1,
  "newProjectRoot": "projects",
  "projects": {
    "angular.io-example": {
      "root": "",
-      "sourceRoot": "src",
      "projectType": "application",
      "prefix": "app",
-      "schematics": {},
      "architect": {
        "build": {
          "builder": "@angular-devkit/build-angular:browser",
@ -19,12 +17,24 @@
            "polyfills": "src/polyfills.ts",
            "tsConfig": "src/tsconfig.app.json",
            "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "favicon.ico",
+                "input": "src",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              }
            ],
            "styles": [
-              "src/styles.css",
-              "src/test.css"
+              {
+                "input": "src/styles.css"
+              },
+              {
+                "input": "src/test.css"
+              }
            ],
            "scripts": []
          },
@ -73,12 +83,22 @@
            "tsConfig": "src/tsconfig.spec.json",
            "karmaConfig": "src/karma.conf.js",
            "styles": [
-              "src/styles.css"
+              {
+                "input": "styles.css"
+              }
            ],
            "scripts": [],
            "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "favicon.ico",
+                "input": "src/",
+                "output": "/"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              }
            ]
          }
        },
@ -99,18 +119,12 @@
    "angular.io-example-e2e": {
      "root": "e2e/",
      "projectType": "application",
-      "prefix": "",
      "architect": {
        "e2e": {
          "builder": "@angular-devkit/build-angular:protractor",
          "options": {
            "protractorConfig": "e2e/protractor.conf.js",
            "devServerTarget": "angular.io-example:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "angular.io-example:serve:production"
-            }
          }
        },
        "lint": {
@ -124,6 +138,5 @@
        }
      }
    }
-  },
-  "defaultProject": "angular.io-example"
-}
+  }
+}
--- a/aio/tools/examples/shared/boilerplate/universal/angular.json
+++ b/aio/tools/examples/shared/boilerplate/universal/angular.json
@ -1,14 +1,11 @@
 {
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
  "version": 1,
  "newProjectRoot": "projects",
  "projects": {
    "angular.io-example": {
      "root": "",
-      "sourceRoot": "src",
      "projectType": "application",
-      "prefix": "app",
-      "schematics": {},
      "architect": {
        "build": {
          "builder": "@angular-devkit/build-angular:browser",
@ -16,11 +13,19 @@
            "outputPath": "dist/browser",
            "index": "src/index.html",
            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
            "tsConfig": "src/tsconfig.app.json",
+            "polyfills": "src/polyfills.ts",
            "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "favicon.ico",
+                "input": "src",
+                "output": "/"
+              }
            ],
            "styles": [
              "src/styles.css"
@ -29,12 +34,6 @@
          },
          "configurations": {
            "production": {
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
              "optimization": true,
              "outputHashing": "all",
              "sourceMap": false,
@ -43,7 +42,13 @@
              "aot": true,
              "extractLicenses": true,
              "vendorChunk": false,
-              "buildOptimizer": true
+              "buildOptimizer": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ]
            }
          }
        },
@ -68,16 +73,24 @@
          "builder": "@angular-devkit/build-angular:karma",
          "options": {
            "main": "src/test.ts",
+            "karmaConfig": "./karma.conf.js",
            "polyfills": "src/polyfills.ts",
            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
+            "scripts": [],
            "styles": [
              "src/styles.css"
            ],
-            "scripts": [],
            "assets": [
-              "src/favicon.ico",
-              "src/assets"
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "favicon.ico",
+                "input": "src",
+                "output": "/"
+              }
            ]
          }
        },
@ -104,26 +117,24 @@
      }
    },
    "angular.io-example-e2e": {
-      "root": "e2e/",
+      "root": "",
      "projectType": "application",
-      "prefix": "",
+      "cli": {},
+      "schematics": {},
      "architect": {
        "e2e": {
          "builder": "@angular-devkit/build-angular:protractor",
          "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
+            "protractorConfig": "./protractor.conf.js",
            "devServerTarget": "angular.io-example:serve"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "angular.io-example:serve:production"
-            }
          }
        },
        "lint": {
          "builder": "@angular-devkit/build-angular:tslint",
          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
+            "tsConfig": [
+              "e2e/tsconfig.e2e.json"
+            ],
            "exclude": [
              "**/node_modules/**"
            ]
@ -132,5 +143,14 @@
      }
    }
  },
-  "defaultProject": "angular.io-example"
-}
+  "cli": {},
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "app",
+      "styleext": "css"
+    },
+    "@schematics/angular:directive": {
+      "prefix": "app"
+    }
+  }
+}
--- a/aio/tools/examples/shared/boilerplate/universal/package.json
+++ b/aio/tools/examples/shared/boilerplate/universal/package.json
@ -16,47 +16,47 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "~7.0.0-rc.0",
-    "@angular/common": "~7.0.0-rc.0",
-    "@angular/compiler": "~7.0.0-rc.0",
-    "@angular/core": "~7.0.0-rc.0",
-    "@angular/forms": "~7.0.0-rc.0",
-    "@angular/http": "~7.0.0-rc.0",
-    "@angular/platform-browser": "~7.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "~7.0.0-rc.0",
-    "@angular/router": "~7.0.0-rc.0",
-    "@nguniversal/common": "^6.1.0",
-    "@nguniversal/express-engine": "^6.1.0",
-    "@nguniversal/module-map-ngfactory-loader": "^6.1.0",
+    "@angular/animations": "^6.0.0",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/forms": "^6.0.0",
+    "@angular/http": "^6.0.0",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
+    "@angular/router": "^6.0.0",
    "angular-in-memory-web-api": "^0.6.0",
+    "@nguniversal/common": "^6.0.0",
+    "@nguniversal/express-engine": "^6.0.0",
+    "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
    "core-js": "^2.5.4",
-    "rxjs": "^6.3.0",
+    "rxjs": "^6.0.0",
    "web-animations-js": "^2.3.1",
-    "zone.js": "~0.8.26"
+    "zone.js": "^0.8.24"    
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "~0.9.0-rc.2",
-    "@angular/cli": "~7.0.0-rc.2",
-    "@angular/compiler-cli": "~7.0.0-rc.0",
-    "@angular/language-service": "~7.0.0-rc.0",
-    "@angular/platform-server": "~7.0.0-rc.0",
-    "@types/jasmine": "~2.8.8",
+    "@angular/cli": "^6.0.0",
+    "@angular/compiler-cli": "^6.0.0",
+    "@angular/language-service": "^6.0.0",
+    "@angular/platform-server": "^6.0.0",
+    "@angular-devkit/build-angular": "~0.6.0",
+    "@types/jasmine": "~2.8.6",
    "@types/jasminewd2": "~2.0.3",
    "@types/node": "~8.9.4",
-    "codelyzer": "~4.3.0",
+    "codelyzer": "~4.2.1",
    "jasmine-core": "~2.99.1",
-    "jasmine-marbles": "^0.4.0",
+    "jasmine-marbles": "^0.3.1",
    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.0.0",
+    "karma": "~2.0.0",
    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
+    "karma-coverage-istanbul-reporter": "~1.4.2",
+    "karma-jasmine": "~1.1.1",
    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.4.0",
+    "protractor": "~5.3.0",
    "ts-loader": "^4.2.0",
-    "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.1.1",
-    "webpack-cli": "^3.1.0"
+    "ts-node": "~5.0.1",
+    "tslint": "~5.9.1",
+    "typescript": "~2.7.2",
+    "webpack-cli": "^2.1.2"
  }
 }
--- a/aio/tools/examples/shared/package.json
+++ b/aio/tools/examples/shared/package.json
@ -18,61 +18,60 @@
  "author": "",
  "license": "MIT",
  "dependencies": {
-    "@angular/animations": "~7.0.0-rc.0",
-    "@angular/common": "~7.0.0-rc.0",
-    "@angular/compiler": "~7.0.0-rc.0",
-    "@angular/core": "~7.0.0-rc.0",
-    "@angular/elements": "~7.0.0-rc.0",
-    "@angular/forms": "~7.0.0-rc.0",
-    "@angular/http": "~7.0.0-rc.0",
-    "@angular/platform-browser": "~7.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "~7.0.0-rc.0",
-    "@angular/router": "~7.0.0-rc.0",
-    "@angular/service-worker": "~7.0.0-rc.0",
-    "@angular/upgrade": "~7.0.0-rc.0",
-    "@nguniversal/common": "^6.1.0",
-    "@nguniversal/express-engine": "^6.1.0",
-    "@nguniversal/module-map-ngfactory-loader": "^6.1.0",
+    "@angular/animations": "^6.0.0",
+    "@angular/common": "^6.0.0",
+    "@angular/compiler": "^6.0.0",
+    "@angular/core": "^6.0.0",
+    "@angular/elements": "^6.0.0",
+    "@angular/forms": "^6.0.0",
+    "@angular/http": "^6.0.0",
+    "@angular/platform-browser": "^6.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.0",
+    "@angular/router": "^6.0.0",
+    "@angular/service-worker": "^6.0.0",
+    "@angular/upgrade": "^6.0.0",
+    "@nguniversal/express-engine": "^6.0.0",
+    "@nguniversal/module-map-ngfactory-loader": "^6.0.0",
    "angular-in-memory-web-api": "^0.6.0",
    "core-js": "^2.5.4",
    "express": "^4.14.1",
    "rxjs": "^6.3.0",
    "systemjs": "0.19.39",
    "web-animations-js": "^2.3.1",
-    "zone.js": "~0.8.26"
+    "zone.js": "^0.8.24"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "~0.9.0-rc.2",
-    "@angular/cli": "^7.0.0-rc.2",
-    "@angular/compiler-cli": "~7.0.0-rc.0",
-    "@angular/language-service": "~7.0.0-rc.0",
-    "@angular/platform-server": "~7.0.0-rc.0",
+    "@angular-devkit/build-angular": "~0.6.0",
+    "@angular/cli": "^6.0.0",
+    "@angular/compiler-cli": "^6.0.0",
+    "@angular/language-service": "^6.0.0",
+    "@angular/platform-server": "^6.0.0",
    "@types/angular": "^1.6.47",
    "@types/angular-animate": "^1.5.10",
    "@types/angular-mocks": "^1.6.0",
    "@types/angular-resource": "^1.5.14",
    "@types/angular-route": "^1.3.5",
    "@types/express": "^4.0.35",
-    "@types/jasmine": "~2.8.8",
-    "@types/jasminewd2": "~2.0.3",
+    "@types/jasmine": "~2.8.0",
+    "@types/jasminewd2": "^2.0.3",
    "@types/jquery": "^3.3.4",
-    "@types/node": "~8.9.4",
+    "@types/node": "^6.0.45",
    "canonical-path": "0.0.2",
    "concurrently": "^3.0.0",
    "http-server": "^0.9.0",
    "jasmine-core": "~2.99.1",
-    "jasmine-marbles": "^0.4.0",
+    "jasmine-marbles": "^0.3.1",
    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.0.0",
+    "karma": "~1.7.1",
    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
+    "karma-coverage-istanbul-reporter": "~1.4.2",
+    "karma-jasmine": "~1.1.1",
    "karma-jasmine-html-reporter": "^0.2.2",
    "karma-phantomjs-launcher": "^1.0.2",
    "lite-server": "^2.2.2",
    "lodash": "^4.16.2",
    "phantomjs-prebuilt": "^2.1.7",
-    "protractor": "~5.4.0",
+    "protractor": "~5.3.0",
    "rimraf": "^2.5.4",
    "rollup": "^0.41.6",
    "rollup-plugin-commonjs": "^8.0.2",
@ -80,10 +79,10 @@
    "rollup-plugin-uglify": "^1.0.1",
    "source-map-explorer": "^1.3.2",
    "ts-loader": "^4.2.0",
-    "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.1.1",
-    "webpack-cli": "^3.1.0"
+    "ts-node": "^5.0.1",
+    "tslint": "^5.9.1",
+    "typescript": "2.7.2",
+    "webpack-cli": "^2.0.14"
  },
  "repository": {}
 }
--- a/aio/tools/examples/shared/yarn.lock
+++ b/aio/tools/examples/shared/yarn.lock
--- a/aio/yarn.lock
+++ b/aio/yarn.lock
--- a/docs/BAZEL.md
+++ b/docs/BAZEL.md
@ -72,7 +72,7 @@ keeps the outputs up-to-date as you save sources.

 If you're experiencing problems with seemingly unrelated tests failing, it may be because you're not using the proper flags with your Bazel test runs in Angular.

-See also: [`//tools/bazel.rc`](https://github.com/angular/angular/blob/master/tools/bazel.rc) where `--define=ivy=false` is defined as default.
+See also: [`//.bazelrc`](https://github.com/angular/angular/blob/master/.bazelrc) where `--define=ivy=false` is defined as default.

 - `--config=debug`: build and launch in debug mode (see [debugging](#debugging) instructions below)
 - `--test_arg=--node_options=--inspect=9228`: change the inspector port.
@ -165,7 +165,7 @@ You can see an overview at https://www.kchodorow.com/blog/2017/03/27/stamping-yo
 In our repo, here is how it's configured:

 1) In `tools/bazel_stamp_vars.sh` we run the `git` commands to generate our versioning info.
-1) In `tools/bazel.rc` we register this script as the value for the `workspace_status_command` flag. Bazel will run the script when it needs to stamp a binary.
+1) In `.bazelrc` we register this script as the value for the `workspace_status_command` flag. Bazel will run the script when it needs to stamp a binary.

 Note that Bazel has a `--stamp` argument to `bazel build`, but this has no effect since our stamping takes place in Skylark rules. See https://github.com/bazelbuild/bazel/issues/1054

--- a/integration/bazel/tools/bazel.rc
+++ b/integration/bazel/tools/bazel.rc
--- a/integration/bazel/BUILD.bazel
+++ b/integration/bazel/BUILD.bazel
@ -11,26 +11,3 @@ alias(
    name = "tsconfig.json",
    actual = "//src:tsconfig.json",
 )
-
-filegroup(
-    name = "node_modules",
-    srcs = glob(
-        [
-            # Include only .js, .json & .d.ts files to reduce the number of
-            # files in the //:node_modules filegroup
-            "node_modules/**/*.js",
-            "node_modules/**/*.json",
-            "node_modules/**/*.d.ts",
-            # All the files in the http-server package are necesssary
-            "node_modules/http-server/**",
-            # All the files in the protractor package are necesssary
-            "node_modules/protractor/**",
-            # Also include all files in node_modules/.bin
-            "node_modules/.bin/*",
-        ],
-        exclude = [
-            # Exclude files with spaces which are illegal bazel labels
-            "node_modules/**/* *",
-        ],
-    ),
-)
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@ -3,47 +3,41 @@ workspace(name = "bazel_integration_test")
 #
 # Download Bazel toolchain dependencies as needed by build actions
 #
-local_repository(
-    name = "build_bazel_rules_typescript",
-    path = "node_modules/@bazel/typescript",
-)
-load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
-rules_typescript_dependencies()
-
-http_archive(
-    name = "io_bazel_rules_sass",
-    url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip",
-    strip_prefix = "rules_sass-1.11.0",
-    sha256 = "dbe9fb97d5a7833b2a733eebc78c9c1e3880f676ac8af16e58ccf2139cbcad03",
-)
-
-#
-# Point Bazel to WORKSPACEs that live in subdirectories
-#

 local_repository(
    name = "angular",
    path = "../..",
 )

-local_repository(
+http_archive(
    name = "rxjs",
-    path = "node_modules/rxjs/src",
+    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
+    strip_prefix = "package/src",
+    sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
 )

+load("@angular//packages/bazel:package.bzl", "rules_angular_dependencies")
+
+rules_angular_dependencies()
+
 #
-# Load and install our dependencies downloaded above.
+# Setup dependencies loaded above
 #

-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
+load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")

 check_bazel_version("0.17.0")
 node_repositories(
-    package_json = ["//:package.json"],
    node_version = "10.9.0",
    yarn_version = "1.9.2",
 )

+yarn_install(
+    name = "npm",
+    package_json = "//src:package.json",
+    yarn_lock = "//src:yarn.lock",
+)
+
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")

 go_rules_dependencies()
--- a/integration/bazel/package.json
+++ b/integration/bazel/package.json
@ -4,20 +4,9 @@
  "version": "0.0.0",
  "license": "MIT",
  "dependencies": {
-    "reflect-metadata": "file:../../node_modules/reflect-metadata",
-    "rxjs": "file:../../node_modules/rxjs",
-    "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../node_modules/zone.js"
-  },
-  "devDependencies": {
-    "@bazel/typescript": "0.17.0",
-    "@types/jasmine": "file:../../node_modules/@types/jasmine",
-    "@types/source-map": "0.5.1",
-    "protractor": "file:../../node_modules/protractor",
-    "tsickle": "file:../../node_modules/tsickle",
-    "typescript": "file:../../node_modules/typescript"
  },
  "scripts": {
+    "//": "deps are listed in src/package.json which is used by yarn_install",
    "test": "bazel build ... --noshow_progress && bazel test ..."
  }
 }
--- a/integration/bazel/src/BUILD.bazel
+++ b/integration/bazel/src/BUILD.bazel
@ -13,6 +13,7 @@ ng_module(
        "@angular//packages/common/http",
        "@angular//packages/core",
        "@angular//packages/platform-browser",
+        "@npm//@types",
    ],
 )

@ -21,14 +22,14 @@ load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
 ts_devserver(
    name = "devserver",
    additional_root_paths = [
-        "bazel_integration_test/node_modules/tslib",
-        "bazel_integration_test/node_modules/zone.js/dist",
+        "npm/node_modules/tslib",
+        "npm/node_modules/zone.js/dist",
    ],
    entry_module = "bazel_integration_test/src/main",
    serving_path = "/bundle.min.js",
    static_files = [
-        "//:node_modules/tslib/tslib.js",
-        "//:node_modules/zone.js/dist/zone.min.js",
+        "@npm//node_modules/tslib:tslib.js",
+        "@npm//node_modules/zone.js:dist/zone.min.js",
        "index.html",
    ],
    deps = ["//src"],
@ -39,7 +40,6 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "rollup_bundle")
 rollup_bundle(
    name = "bundle",
    entry_point = "src/main",
-    node_modules = "//:node_modules",
    deps = ["//src"],
 )

@ -47,7 +47,7 @@ rollup_bundle(
 # package.
 genrule(
    name = "zone.js",
-    srcs = ["//:node_modules/zone.js/dist/zone.min.js"],
+    srcs = ["@npm//node_modules/zone.js:dist/zone.min.js"],
    outs = ["zone.min.js"],
    cmd = "cp $< $@",
 )
--- a/integration/bazel/src/hello-world/BUILD.bazel
+++ b/integration/bazel/src/hello-world/BUILD.bazel
@ -18,13 +18,13 @@ ng_module(
    assets = [":hello-world-styles"],
    deps = [
        "@angular//packages/core",
+        "@npm//@types",
    ],
 )

 ng_package(
    name = "npm_package",
    entry_point = "src/hello-world/index.js",
-    node_modules = "//:node_modules",
    deps = [":hello-world"],
 )

@ -38,19 +38,23 @@ ts_library(
        "@angular//packages/core/testing",
        "@angular//packages/platform-browser",
        "@angular//packages/platform-browser-dynamic/testing",
+        "@npm//@types",
+        "@npm//jasmine",
    ],
 )

 ts_web_test_suite(
    name = "test",
-    srcs = ["//:node_modules/tslib/tslib.js"],
+    srcs = ["@npm//node_modules/tslib:tslib.js"],
    bootstrap = [
-        "//:node_modules/zone.js/dist/zone-testing-bundle.js",
-        "//:node_modules/reflect-metadata/Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone-testing-bundle.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
    ],
    browsers = [
        "@io_bazel_rules_webtesting//browsers:chromium-local",
-        "@io_bazel_rules_webtesting//browsers:firefox-local",
+        # TODO(gregmagolan): re-enable firefox testing once fixed
+        # See https://github.com/bazelbuild/rules_typescript/issues/296
+        # "@io_bazel_rules_webtesting//browsers:firefox-local",
    ],
    deps = [
        ":test_lib",
--- a/integration/bazel/src/package.json
+++ b/integration/bazel/src/package.json
@ -0,0 +1,27 @@
+{
+  "name": "angular-bazel",
+  "description": "example and integration test for building Angular apps with Bazel",
+  "version": "0.0.0",
+  "license": "MIT",
+  "dependencies": {
+    "reflect-metadata": "0.1.12",
+    "rxjs": "6.3.3",
+    "tslib": "1.9.3",
+    "zone.js": "0.8.26"
+  },
+  "devDependencies": {
+    "@angular/bazel": "file:../angular/dist/packages-dist/bazel",
+    "@angular/compiler": "file:../angular/dist/packages-dist/compiler",
+    "@angular/compiler-cli": "file:../angular/dist/packages-dist/compiler-cli",
+    "@bazel/karma": "0.20.2",
+    "@bazel/typescript": "0.20.2",
+    "@types/jasmine": "2.8.8",
+    "@types/source-map": "0.5.1",
+    "protractor": "5.1.2",
+    "tsickle": "0.32.0",
+    "typescript": "3.1.1"
+  },
+  "scripts": {
+    "//": "TODO(gregmagolan): figure out how to keep dependencies here up to date with the root package.json"
+  }
+}
--- a/integration/bazel/src/yarn.lock
+++ b/integration/bazel/src/yarn.lock
--- a/integration/bazel/test/e2e/BUILD.bazel
+++ b/integration/bazel/test/e2e/BUILD.bazel
@ -6,6 +6,10 @@ ts_library(
    testonly = 1,
    srcs = ["app.spec.ts"],
    tsconfig = ":tsconfig.json",
+    deps = [
+        "@npm//@types",
+        "@npm//protractor",
+    ],
 )

 ts_library(
@ -13,13 +17,20 @@ ts_library(
    testonly = 1,
    srcs = ["on-prepare.ts"],
    tsconfig = ":tsconfig.json",
-    deps = ["@angular//packages/bazel/src/protractor/utils"],
+    deps = [
+        "@npm//@angular/bazel",
+        "@npm//@types",
+        "@npm//protractor",
+    ],
 )

 protractor_web_test_suite(
    name = "devserver_test",
    configuration = "//:protractor.conf.js",
-    data = ["@angular//packages/bazel/src/protractor/utils"],
+    data = [
+        "@npm//@angular/bazel",
+        "@npm//protractor",
+    ],
    on_prepare = ":ts_on_prepare",
    server = "//src:devserver",
    deps = [":e2e"],
@ -28,7 +39,10 @@ protractor_web_test_suite(
 protractor_web_test_suite(
    name = "prodserver_test",
    configuration = "//:protractor.conf.js",
-    data = ["@angular//packages/bazel/src/protractor/utils"],
+    data = [
+        "@npm//@angular/bazel",
+        "@npm//protractor",
+    ],
    on_prepare = ":ts_on_prepare",
    server = "//src:prodserver",
    deps = [":e2e"],
--- a/integration/bazel/yarn.lock
+++ b/integration/bazel/yarn.lock
@ -2,907 +2,3 @@
 # yarn lockfile v1


-"@bazel/typescript@github:bazelbuild/rules_typescript#87d892be147b66e5668ba14f89ef5df8259de102":
-  version "0.16.2"
-  resolved "https://codeload.github.com/bazelbuild/rules_typescript/tar.gz/87d892be147b66e5668ba14f89ef5df8259de102"
-  dependencies:
-    protobufjs "5.0.0"
-    tsutils "2.20.0"
-
-"@types/jasmine@file:../../node_modules/@types/jasmine":
-  version "2.8.8"
-
-"@types/node@^6.0.46":
-  version "6.0.116"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.116.tgz#2f9cd62b4ecc4927e3942e2655c182eecf5b45f1"
-
-"@types/q@^0.0.32":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
-
-"@types/selenium-webdriver@^2.53.35", "@types/selenium-webdriver@~2.53.39":
-  version "2.53.43"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz#2de3d718819bc20165754c4a59afb7e9833f6707"
-
-"@types/source-map@0.5.1":
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.1.tgz#7e74db5d06ab373a712356eebfaea2fad0ea2367"
-
-adm-zip@0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.4.tgz#a61ed5ae6905c3aea58b3a657d25033091052736"
-
-adm-zip@^0.4.7, adm-zip@^0.4.9:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
-
-agent-base@2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-2.1.1.tgz#d6de10d5af6132d5bd692427d46fc538539094c7"
-  dependencies:
-    extend "~3.0.0"
-    semver "~5.0.1"
-
-ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-
-ascli@~1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
-  dependencies:
-    colour "~0.7.1"
-    optjs "~3.2.2"
-
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-
-aws4@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  dependencies:
-    tweetnacl "^0.14.3"
-
-blocking-proxy@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-0.0.5.tgz#462905e0dcfbea970f41aa37223dda9c07b1912b"
-  dependencies:
-    minimist "^1.2.0"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-
-bytebuffer@~5:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
-  dependencies:
-    long "~3"
-
-camelcase@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
-chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-cliui@^3.0.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-
-colour@~0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
-
-combined-stream@1.0.6, combined-stream@~1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  dependencies:
-    assert-plus "^1.0.0"
-
-debug@2:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  dependencies:
-    ms "2.0.0"
-
-decamelize@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
-del@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-
-diff@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-escape-string-regexp@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-
-extend@3, extend@~3.0.0, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "1.0.6"
-    mime-types "^2.1.12"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob@^5.0.10:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.3, glob@^7.0.5, glob@^7.0.6:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-
-har-validator@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  dependencies:
-    ajv "^5.3.0"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-https-proxy-agent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz#35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"
-  dependencies:
-    agent-base "2"
-    debug "2"
-    extend "3"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-ini@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  dependencies:
-    path-is-inside "^1.0.1"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-jasmine-core@~2.99.0:
-  version "2.99.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
-
-jasmine-diff@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8"
-  dependencies:
-    diff "^3.2.0"
-
-jasmine@^2.5.3:
-  version "2.99.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
-  dependencies:
-    exit "^0.1.2"
-    glob "^7.0.6"
-    jasmine-core "~2.99.0"
-
-jasminewd2@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  dependencies:
-    invert-kv "^1.0.0"
-
-long@~3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
-
-mime-db@~1.35.0:
-  version "1.35.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47"
-
-mime-types@^2.1.12, mime-types@~2.1.19:
-  version "2.1.19"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.19.tgz#71e464537a7ef81c15f2db9d97e913fc0ff606f0"
-  dependencies:
-    mime-db "~1.35.0"
-
-"minimatch@2 || 3", minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
-mkdirp@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-
-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"
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-
-object-assign@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-optimist@~0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
-options@>=0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
-
-optjs@~3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
-
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  dependencies:
-    lcid "^1.0.0"
-
-os-tmpdir@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-protobufjs@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.0.tgz#4223063233ea96ac063ca2b554035204db524fa1"
-  dependencies:
-    ascli "~1"
-    bytebuffer "~5"
-    glob "^5.0.10"
-    yargs "^3.10.0"
-
-"protractor@file:../../node_modules/protractor":
-  version "5.1.2"
-  dependencies:
-    "@types/node" "^6.0.46"
-    "@types/q" "^0.0.32"
-    "@types/selenium-webdriver" "~2.53.39"
-    blocking-proxy "0.0.5"
-    chalk "^1.1.3"
-    glob "^7.0.3"
-    jasmine "^2.5.3"
-    jasminewd2 "^2.1.0"
-    optimist "~0.6.0"
-    q "1.4.1"
-    saucelabs "~1.3.0"
-    selenium-webdriver "3.0.1"
-    source-map-support "~0.4.0"
-    webdriver-js-extender "^1.0.0"
-    webdriver-manager "^12.0.6"
-
-psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-q@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-
-q@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-
-"reflect-metadata@file:../../node_modules/reflect-metadata":
-  version "0.1.12"
-
-request@^2.87.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.0"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  dependencies:
-    glob "^7.0.5"
-
-"rxjs@file:../../node_modules/rxjs":
-  version "6.0.0"
-  dependencies:
-    tslib "^1.9.0"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-
-safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-
-saucelabs@~1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.3.0.tgz#d240e8009df7fa87306ec4578a69ba3b5c424fee"
-  dependencies:
-    https-proxy-agent "^1.0.0"
-
-sax@0.6.x:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.6.1.tgz#563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"
-
-sax@>=0.6.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-
-selenium-webdriver@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.0.1.tgz#a2dea5da4a97f6672e89e7ca7276cefa365147a7"
-  dependencies:
-    adm-zip "^0.4.7"
-    rimraf "^2.5.4"
-    tmp "0.0.30"
-    xml2js "^0.4.17"
-
-selenium-webdriver@^2.53.2:
-  version "2.53.3"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz#d29ff5a957dff1a1b49dc457756e4e4bfbdce085"
-  dependencies:
-    adm-zip "0.4.4"
-    rimraf "^2.2.8"
-    tmp "0.0.24"
-    ws "^1.0.1"
-    xml2js "0.4.4"
-
-semver@^5.3.0:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
-
-semver@~5.0.1:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"
-
-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"
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.4.0:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  dependencies:
-    source-map "^0.5.6"
-
-source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
-source-map@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-
-sshpk@^1.7.0:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-    safer-buffer "^2.0.2"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-tmp@0.0.24:
-  version "0.0.24"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.24.tgz#d6a5e198d14a9835cc6f2d7c3d9e302428c8cf12"
-
-tmp@0.0.30:
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
-  dependencies:
-    os-tmpdir "~1.0.1"
-
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
-"tsickle@file:../../node_modules/tsickle":
-  version "0.32.0"
-  dependencies:
-    jasmine-diff "^0.1.3"
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    source-map "^0.6.0"
-    source-map-support "^0.5.0"
-
-tslib@^1.8.1, tslib@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-
-"tslib@file:../../node_modules/tslib":
-  version "1.9.3"
-
-tsutils@2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.20.0.tgz#303394064bc80be8ee04e10b8609ae852e9312d3"
-  dependencies:
-    tslib "^1.8.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-
-"typescript@file:../../node_modules/typescript":
-  version "3.0.1"
-
-ultron@1.0.x:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
-
-uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-webdriver-js-extender@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz#81c533a9e33d5bfb597b4e63e2cdb25b54777515"
-  dependencies:
-    "@types/selenium-webdriver" "^2.53.35"
-    selenium-webdriver "^2.53.2"
-
-webdriver-manager@^12.0.6:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.0.tgz#f6601e52de5f0c97fc7024c889eeb2416f2f1d9d"
-  dependencies:
-    adm-zip "^0.4.9"
-    chalk "^1.1.1"
-    del "^2.2.0"
-    glob "^7.0.3"
-    ini "^1.3.4"
-    minimist "^1.2.0"
-    q "^1.4.1"
-    request "^2.87.0"
-    rimraf "^2.5.2"
-    semver "^5.3.0"
-    xml2js "^0.4.17"
-
-window-size@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
-
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-ws@^1.0.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51"
-  dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
-xml2js@0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.4.tgz#3111010003008ae19240eba17497b57c729c555d"
-  dependencies:
-    sax "0.6.x"
-    xmlbuilder ">=1.0.0"
-
-xml2js@^0.4.17:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~9.0.1"
-
-xmlbuilder@>=1.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.0.0.tgz#c64e52f8ae097fe5fd46d1c38adaade071ee1b55"
-
-xmlbuilder@~9.0.1:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-
-y18n@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-
-yargs@^3.10.0:
-  version "3.32.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
-  dependencies:
-    camelcase "^2.0.1"
-    cliui "^3.0.3"
-    decamelize "^1.1.1"
-    os-locale "^1.4.0"
-    string-width "^1.0.1"
-    window-size "^0.1.4"
-    y18n "^3.2.0"
-
-"zone.js@file:../../node_modules/zone.js":
-  version "0.8.26"
--- a/integration/ngcc/test-local.sh
+++ b/integration/ngcc/test-local.sh
@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-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
--- a/integration/ngcc/test.sh
+++ b/integration/ngcc/test.sh
@ -10,35 +10,16 @@ ivy-ngcc --help
 ivy-ngcc

 # Did it add the appropriate build markers?
-  # - fesm2015
-  ls node_modules/@angular/common | grep __modified_by_ngcc_for_fesm2015
-  if [[ $? != 0 ]]; then exit 1; fi
-  # - esm2015
-  ls node_modules/@angular/common | grep __modified_by_ngcc_for_esm2015
-  if [[ $? != 0 ]]; then exit 1; fi

-# Did it replace the NGCC_PRE markers correctly?
-  grep "= R3_COMPILE_COMPONENT__POST_NGCC__" node_modules/@angular/core/fesm2015/core.js
-  if [[ $? != 0 ]]; then exit 1; fi
-  grep "= R3_COMPILE_COMPONENT__POST_NGCC__" node_modules/@angular/core/fesm5/core.js
-  if [[ $? != 0 ]]; then exit 1; fi
+# - fesm2015
+ls node_modules/@angular/common | grep __modified_by_ngcc_for_fesm2015
+if [[ $? != 0 ]]; then exit 1; fi
+# - esm2015
+ls node_modules/@angular/common | grep __modified_by_ngcc_for_esm2015
+if [[ $? != 0 ]]; then exit 1; fi

-# Did it compile @angular/core/ApplicationModule correctly?
-  grep "ApplicationModule.ngModuleDef = ɵdefineNgModule" node_modules/@angular/core/fesm2015/core.js
-  if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ɵdefineNgModule" node_modules/@angular/core/fesm5/core.js
-  if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ɵngcc0.ɵdefineNgModule" node_modules/@angular/core/esm2015/src/application_module.js
-  if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ɵngcc0.ɵdefineNgModule" node_modules/@angular/core/esm5/src/application_module.js
-  if [[ $? != 0 ]]; then exit 1; fi
-
-# Can it be safely run again (as a noop)?
-ivy-ngcc
-
-# Now try compiling the app using the ngcc compiled libraries
 ngc -p tsconfig-app.json

 # Did it compile the main.ts correctly?
-  grep "directives: \[\S*\.NgIf\]" dist/src/main.js
-  if [[ $? != 0 ]]; then exit 1; fi
+grep "directives: \[\S*\.NgIf\]" dist/src/main.js
+if [[ $? != 0 ]]; then exit 1; fi
--- a/integration/ngcc/yarn.lock
+++ b/integration/ngcc/yarn.lock
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@ -112,7 +112,7 @@ module.exports = function(config) {
    // don't need this entire config file.
    proxies: {
      '/base/angular/': '/base/',
-      '/base/angular_deps/': '/base/',
+      '/base/ngdeps/': '/base/',
    },

    reporters: ['dots'],
--- a/modules/benchmarks/src/largetable/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/BUILD.bazel
@ -23,5 +23,6 @@ ts_library(
    deps = [
        "//modules/e2e_util:lib",
        "//packages:types",
+        "@ngdeps//protractor",
    ],
 )
--- a/modules/benchmarks/src/largetable/render3/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/render3/BUILD.bazel
@ -52,6 +52,10 @@ protractor_web_test(
    data = [
        "//packages/bazel/src/protractor/utils",
        "//packages/benchpress",
+        "@ngdeps//node-uuid",
+        "@ngdeps//protractor",
+        "@ngdeps//reflect-metadata",
+        "@ngdeps//yargs",
    ],
    on_prepare = ":protractor.on-prepare.js",
    server = ":devserver",
--- a/modules/benchmarks/src/largetable/render3/table.ts
+++ b/modules/benchmarks/src/largetable/render3/table.ts
@ -7,7 +7,7 @@
 */

 import {ɵRenderFlags, ɵbind, ɵcontainer, ɵcontainerRefreshEnd, ɵcontainerRefreshStart, ɵdefineComponent, ɵdetectChanges, ɵelementEnd, ɵelementStart, ɵelementStyleProp, ɵelementStyling, ɵembeddedViewEnd, ɵembeddedViewStart, ɵtext, ɵtextBinding as ɵtextBinding} from '@angular/core';
-import {ComponentDef} from '@angular/core/src/render3/interfaces/definition';
+import {ComponentDefInternal} from '@angular/core/src/render3/interfaces/definition';

 import {TableCell, buildTable, emptyTable} from '../util';

@ -16,7 +16,7 @@ export class LargeTableComponent {
  data: TableCell[][] = emptyTable;

  /** @nocollapse */
-  static ngComponentDef: ComponentDef<LargeTableComponent> = ɵdefineComponent({
+  static ngComponentDef: ComponentDefInternal<LargeTableComponent> = ɵdefineComponent({
    type: LargeTableComponent,
    selectors: [['largetable']],
    consts: 3,
--- a/modules/e2e_util/BUILD.bazel
+++ b/modules/e2e_util/BUILD.bazel
@ -9,5 +9,10 @@ ts_library(
    deps = [
        "//packages:types",
        "//packages/benchpress",
+        "@ngdeps//@types/fs-extra",
+        "@ngdeps//@types/selenium-webdriver",
+        "@ngdeps//fs-extra",
+        "@ngdeps//protractor",
+        "@ngdeps//selenium-webdriver",
    ],
 )
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "angular-srcs",
-  "version": "7.0.0-rc.1",
+  "version": "7.0.0-rc.0",
  "private": true,
  "branchPattern": "2.0.*",
  "description": "Angular - a web framework for modern web apps",
@ -41,6 +41,8 @@
  },
  "devDependencies": {
    "@bazel/ibazel": "^0.1.1",
+    "@bazel/karma": "0.20.2",
+    "@bazel/typescript": "0.20.2",
    "@types/angular": "^1.6.47",
    "@types/base64-js": "1.2.5",
    "@types/chai": "^4.1.2",
@ -70,6 +72,7 @@
    "bower": "1.8.2",
    "browserstacktunnel-wrapper": "2.0.1",
    "canonical-path": "0.0.2",
+    "chai": "4.2.0",
    "chokidar": "1.7.0",
    "clang-format": "1.0.41",
    "cldr": "4.10.0",
@ -110,7 +113,6 @@
    "mock-fs": "^4.5.0",
    "mutation-observer": "^1.0.3",
    "node-uuid": "1.4.8",
-    "protobufjs": "5.0.0",
    "protractor": "5.1.2",
    "rewire": "2.5.2",
    "rollup": "0.47.4",
@ -126,7 +128,7 @@
    "tsickle": "0.32",
    "tslint": "5.7.0",
    "tslint-eslint-rules": "4.1.1",
-    "tsutils": "2.20.0",
+    "tsutils": "2.27.2",
    "typescript": "~3.1.1",
    "uglify-es": "^3.3.9",
    "universal-analytics": "0.4.15",
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@ -11,6 +11,10 @@ load("//tools:defaults.bzl", "ts_library")
 ts_library(
    name = "types",
    srcs = glob(["*.ts"]),
+    deps = [
+        "@ngdeps//@types/hammerjs",
+        "@ngdeps//zone.js",
+    ],
 )

 exports_files([
--- a/packages/bazel/BUILD.bazel
+++ b/packages/bazel/BUILD.bazel
@ -1,25 +1,20 @@
 load("//tools:defaults.bzl", "npm_package")

-genrule(
-    name = "workspace",
-    outs = ["WORKSPACE"],
-    cmd = "echo 'workspace(name=\"angular\")' > $@",
-)
-
 npm_package(
    name = "npm_package",
    srcs = [
-        "BUILD.bazel",
-        "index.bzl",
+        "check_version.js",
        "package.json",
+        "protractor-utils.js",
        "//packages/bazel/src:package_assets",
    ],
-    packages = ["//packages/bazel/docs"],
-    # Re-host //packages/bazel/ which is just // in the public distro
-    replacements = {
-        "//packages/bazel/": "//",
-        "angular/packages/bazel/": "angular/",
-    },
+    packages = [
+        "//packages/bazel/docs",
+    ],
    tags = ["release-with-framework"],
-    deps = [":workspace"],
+    deps = [
+        "//packages/bazel/src/ng_package:lib",
+        "//packages/bazel/src/ngc-wrapped:ngc_lib",
+        "//packages/bazel/src/protractor/utils",
+    ],
 )
--- a/packages/bazel/check_version.js
+++ b/packages/bazel/check_version.js
@ -0,0 +1,74 @@
+/**
+ * @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 This script runs as a postinstall in the published npm packages
+ * and checks that the version of the build_bazel_rules_typescript external
+ * repository matches that of the published npm package.
+ *
+ * Note, this check is only performed with bazel managed deps when the yarn or
+ * npm install is from a yarn_install or npm_install repository rule. For self
+ * managed bazel deps this check is not performed and it is the responsibility
+ * of the user to ensure that the versions match.
+ */
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+
+// Version in package.bzl should match the npm package version
+// but this should be tolerant of development stamped versions such as
+// "0.17.0-7-g76dc057"
+const npmPackageVersion = process.env.npm_package_version.split('-')[0];
+
+// If this is a bazel managed deps yarn_install or npm_install then the
+// cwd is $(bazel info
+// output_base)/external/<wksp>/node_modules/@angular/bazel and there should
+// be $(bazel info output_base)/external/<wksp>/internal/generate_build_file.js
+// folder
+function isBazelManagedDeps() {
+  try {
+    fs.statSync('../../../generate_build_file.js');
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+if (isBazelManagedDeps()) {
+  let contents;
+  try {
+    // If this is a yarn_install or npm_install then the cwd is $(bazel info
+    // output_base)/external/<wksp>/node_modules/@angular/bazel so we can look for
+    // the package.json file under $(bazel info
+    // output_base)/external/angular/package.json
+    const packagePath = path.resolve(process.cwd(), '../../../../angular/package.json');
+    contents = require(packagePath);
+  } catch (e) {
+    throw new Error('The angular repository is not installed in your Bazel WORKSPACE file');
+  }
+  if (contents.name !== 'angular-srcs') {
+    throw new Error('Invalid package.json in angular repository');
+  }
+  // Be tolerant of versions such as "0.17.0-7-g76dc057"
+  const angularPackageVersion = contents.version.split('-')[0];
+  if (npmPackageVersion !== angularPackageVersion) {
+    // TODO: we might need to support a range here.
+    // For example, if you end up with @angular/bazel@6.1.8 and
+    // @angular/bazel@6.1.9 both installed one of the postinstalls is
+    // guaranteed to fail since there's only one version of
+    // angular
+    throw new Error(`Expected angular repository to be version ${
+        npmPackageVersion} but found ${angularPackageVersion}`);
+  }
+} else {
+  // No version check
+  console.warn(`WARNING: With self managed deps you must ensure the @angular/bazel
+npm package version matches the angular repository version.
+Use yarn_install or npm_install for this version to be checked automatically.
+`);
+}
--- a/packages/bazel/package.bzl
+++ b/packages/bazel/package.bzl
@ -0,0 +1,116 @@
+# 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
+
+"""Package file which defines dependencies of Angular rules in skylark
+"""
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load(":rules_nodejs_package.bzl", "rules_nodejs_dependencies")
+load(":rules_typescript_package.bzl", "rules_typescript_dependencies")
+
+def rules_angular_dependencies():
+    """
+    Fetch our transitive dependencies.
+
+    If the user wants to get a different version of these, they can just fetch it
+    from their WORKSPACE before calling this function, or not call this function at all.
+    """
+
+    #
+    # Download Bazel toolchain dependencies as needed by build actions
+    #
+    _maybe(
+        http_archive,
+        name = "build_bazel_rules_typescript",
+        url = "https://github.com/bazelbuild/rules_typescript/archive/0.20.2.zip",
+        strip_prefix = "rules_typescript-0.20.2",
+    )
+
+    # Needed for Remote Execution
+    _maybe(
+        http_archive,
+        name = "bazel_toolchains",
+        sha256 = "c3b08805602cd1d2b67ebe96407c1e8c6ed3d4ce55236ae2efe2f1948f38168d",
+        strip_prefix = "bazel-toolchains-5124557861ebf4c0b67f98180bff1f8551e0b421",
+        urls = [
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/5124557861ebf4c0b67f98180bff1f8551e0b421.tar.gz",
+            "https://github.com/bazelbuild/bazel-toolchains/archive/5124557861ebf4c0b67f98180bff1f8551e0b421.tar.gz",
+        ],
+    )
+
+    # Angular apps don't necessarily depend on Sass, but it's common enough
+    _maybe(
+        http_archive,
+        name = "io_bazel_rules_sass",
+        sha256 = "dbe9fb97d5a7833b2a733eebc78c9c1e3880f676ac8af16e58ccf2139cbcad03",
+        strip_prefix = "rules_sass-1.11.0",
+        url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip",
+    )
+
+    rules_typescript_dependencies()
+    rules_nodejs_dependencies()
+
+def rules_angular_dev_dependencies():
+    """
+    Fetch dependencies needed for local development, but not needed by users.
+
+    These are in this file to keep version information in one place, and make the WORKSPACE
+    shorter.
+    """
+
+    # We have a source dependency on the Devkit repository, because it's built with
+    # Bazel.
+    # This allows us to edit sources and have the effect appear immediately without
+    # re-packaging or "npm link"ing.
+    # Even better, things like aspects will visit the entire graph including
+    # ts_library rules in the devkit repository.
+    http_archive(
+        name = "angular_cli",
+        sha256 = "8cf320ea58c321e103f39087376feea502f20eaf79c61a4fdb05c7286c8684fd",
+        strip_prefix = "angular-cli-6.1.0-rc.0",
+        url = "https://github.com/angular/angular-cli/archive/v6.1.0-rc.0.zip",
+    )
+
+    http_archive(
+        name = "org_brotli",
+        sha256 = "774b893a0700b0692a76e2e5b7e7610dbbe330ffbe3fe864b4b52ca718061d5a",
+        strip_prefix = "brotli-1.0.5",
+        url = "https://github.com/google/brotli/archive/v1.0.5.zip",
+    )
+
+    # Fetching the Bazel source code allows us to compile the Skylark linter
+    http_archive(
+        name = "io_bazel",
+        sha256 = "978f7e0440dd82182563877e2e0b7c013b26b3368888b57837e9a0ae206fd396",
+        strip_prefix = "bazel-0.18.0",
+        url = "https://github.com/bazelbuild/bazel/archive/0.18.0.zip",
+    )
+
+    # This commit matches the version of buildifier in angular/ngcontainer
+    # If you change this, also check if it matches the version in the angular/ngcontainer
+    # version in /.circleci/config.yml
+    BAZEL_BUILDTOOLS_VERSION = "49a6c199e3fbf5d94534b2771868677d3f9c6de9"
+
+    http_archive(
+        name = "com_github_bazelbuild_buildtools",
+        sha256 = "edf39af5fc257521e4af4c40829fffe8fba6d0ebff9f4dd69a6f8f1223ae047b",
+        strip_prefix = "buildtools-%s" % BAZEL_BUILDTOOLS_VERSION,
+        url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % BAZEL_BUILDTOOLS_VERSION,
+    )
+
+    #############################################
+    # Dependencies for generating documentation #
+    #############################################
+    http_archive(
+        name = "io_bazel_skydoc",
+        sha256 = "7bfb5545f59792a2745f2523b9eef363f9c3e7274791c030885e7069f8116016",
+        strip_prefix = "skydoc-fe2e9f888d28e567fef62ec9d4a93c425526d701",
+        # TODO: switch to upstream when https://github.com/bazelbuild/skydoc/pull/103 is merged
+        url = "https://github.com/alexeagle/skydoc/archive/fe2e9f888d28e567fef62ec9d4a93c425526d701.zip",
+    )
+
+def _maybe(repo_rule, name, **kwargs):
+    if name not in native.existing_rules():
+        repo_rule(name = name, **kwargs)
--- a/packages/bazel/package.json
+++ b/packages/bazel/package.json
@ -4,10 +4,17 @@
  "description": "Angular - bazel build rules",
  "author": "angular",
  "license": "MIT",
+  "bin": {
+    "ngc-wrapped": "./src/ngc-wrapped/index.js",
+    "packager": "./src/ng_package/packager.js",
+    "xi18n": "./src/ngc-wrapped/extract_i18n.js",
+    "modify_tsconfig": "./src/modify_tsconfig.js"
+  },
+  "typings": "./src/ngc-wrapped/index.d.ts",
  "dependencies": {
-    "@bazel/typescript": "^0.15.0",
+    "@bazel/typescript": "^0.19.1",
    "@types/node": "6.0.84",
-    "protobufjs": "5.0.0"
+    "tsickle": "0.28.0"
  },
  "peerDependencies": {
    "@angular/compiler-cli": "0.0.0-PLACEHOLDER",
@ -19,5 +26,8 @@
  },
  "ng-update": {
    "packageGroup": "NG_UPDATE_PACKAGE_GROUP"
+  },
+  "scripts": {
+    "postinstall": "node ./check_version.js"
  }
 }
--- a/packages/compiler-cli/src/ngtsc/translator/index.ts
+++ b/packages/compiler-cli/src/ngtsc/translator/index.ts
@ -6,4 +6,4 @@
 * found in the LICENSE file at https://angular.io/license
 */

-export {ImportManager, translateExpression, translateStatement, translateType} from './src/translator';
+module.exports = require('./src/protractor/utils');
--- a/packages/bazel/rules_nodejs_package.bzl
+++ b/packages/bazel/rules_nodejs_package.bzl
@ -0,0 +1,56 @@
+# Copyright 2018 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Dependency-related rules defining our version and dependency versions.
+
+Fulfills similar role as the package.json file.
+"""
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+# This file mirrored from https://raw.githubusercontent.com/bazelbuild/rules_nodejs/0.15.0/package.bzl
+VERSION = "0.15.0"
+
+def rules_nodejs_dependencies():
+    """
+    Fetch our transitive dependencies.
+
+    If the user wants to get a different version of these, they can just fetch it
+    from their WORKSPACE before calling this function, or not call this function at all.
+    """
+    _maybe(
+        http_archive,
+        name = "bazel_skylib",
+        url = "https://github.com/bazelbuild/bazel-skylib/archive/0.3.1.zip",
+        strip_prefix = "bazel-skylib-0.3.1",
+        sha256 = "95518adafc9a2b656667bbf517a952e54ce7f350779d0dd95133db4eb5c27fb1",
+    )
+
+    # Needed for Remote Build Execution
+    # See https://releases.bazel.build/bazel-toolchains.html
+    # Not strictly a dependency for all users, but it is convenient for them to have this repository
+    # defined to reduce the effort required to on-board to remote execution.
+    http_archive(
+        name = "bazel_toolchains",
+        urls = [
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/cdea5b8675914d0a354d89f108de5d28e54e0edc.tar.gz",
+            "https://github.com/bazelbuild/bazel-toolchains/archive/cdea5b8675914d0a354d89f108de5d28e54e0edc.tar.gz",
+        ],
+        strip_prefix = "bazel-toolchains-cdea5b8675914d0a354d89f108de5d28e54e0edc",
+        sha256 = "cefb6ccf86ca592baaa029bcef04148593c0efe8f734542f10293ea58f170715",
+    )
+
+def _maybe(repo_rule, name, **kwargs):
+    if name not in native.existing_rules():
+        repo_rule(name = name, **kwargs)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Greg Magolan	652ac79d63	build: idiomatic install of @angular/bazel npm package (#26258 )	2018-10-16 13:20:00 -07:00
Alex Eagle	31632b27c7	build: update ngcontainer to bazel 0.18.0 (#26465 ) * build: update ngcontainer to bazel 0.18.0 * build: update skylint to bazel 0.18 use .bazelignore file to ignore node_modules directory	2018-10-15 16:51:26 -07:00
Greg Magolan	08e4489cf5	build(bazel): update to rules_typescript 0.20.2 (#26279 )	2018-10-05 17:57:18 -07:00
Greg Magolan	0e1ca096da	build: update to rules_typescript 0.20.1 and rules_nodejs 0.15.0 (#26260 )	2018-10-05 07:16:47 -07:00
Greg Magolan	2546c66376	build(bazel): use fine-grained npm deps (#26111 )	2018-10-04 13:14:14 -07:00
Alex Eagle	81f5656be0	build: introduce a package.bzl This lets Angular Bazel users install our transitive deps, rather than have to list them in their WORKSPACE file. If they want a different version of one of these deps, they just need to install it before calling rules_angular_dependencies.	2018-10-02 06:46:07 -07:00