release: cut the v9.0.6 release

Adding a script that compares commits in master and patch branches and finds a delta between them. This is useful for release reviews, to make sure all the necessary commits are included into the patch branch and there is no discrepancy.

PR Close #35130

.circleci/config.yml

@@ -22,14 +22,14 @@ version: 2.1
 # **NOTE 1 **: If you change the cache key prefix, also sync the cache_key_fallback to match.
 # **NOTE 2 **: Keep the static part of the cache key as prefix to enable correct fallbacks.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_3: &cache_key v3-angular-node-12-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
+var_3: &cache_key v4-angular-node-12-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
-var_4: &cache_key_fallback v3-angular-node-12-
+var_4: &cache_key_fallback v4-angular-node-12-
 var_3_win: &cache_key_win v5-angular-win-node-12-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
 var_4_win: &cache_key_win_fallback v5-angular-win-node-12-
 
 # Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the
 # cache keys also update the SHA for the "COMPONENTS_REPO_COMMIT" environment variable.
-var_5: &components_repo_unit_tests_cache_key v5-angular-components-2ec7254f88c4865e0de251f74c27e64c9d00d40a
+var_5: &components_repo_unit_tests_cache_key v5-angular-components-598db096e668aa7e9debd56eedfd127b7a55e371
 var_6: &components_repo_unit_tests_cache_key_fallback v5-angular-components-
 
 # Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
@@ -274,7 +274,7 @@ jobs:
       - run: 'yarn bazel:lint ||
               (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'
 
-      - run: yarn gulp lint
+      - run: yarn lint
       - run: node tools/pullapprove/verify.js
 
   test:
@@ -465,12 +465,14 @@ jobs:
       - when:
           condition: << parameters.ivy >>
           steps:
-              # Rename the Ivy packages dist folder to "dist/packages-dist" as the AIO
+              # Rename the "dist/*-dist-ivy-aot" packages directories (persisted to the workspace by
-              # package installer picks up the locally built packages from that location.
+              # the `build-ivy-npm-packages` job) to "dist/*-dist" as the AIO package installer
+              # picks up the locally built packages from that location.
               # *Note*: We could also adjust the packages installer, but given we won't have
               # two different folders of Angular distributions in the future, we should keep
               # the packages installer unchanged.
             - run: mv dist/packages-dist-ivy-aot dist/packages-dist
+            - run: mv dist/zone.js-dist-ivy-aot dist/zone.js-dist
         # Run examples tests. The "CIRCLE_NODE_INDEX" will be set if "parallelism" is enabled.
         # Since the parallelism is set to "5", there will be five parallel CircleCI containers.
         # with either "0", "1", etc as node index. This can be passed to the "--shard" argument.
@@ -520,7 +522,7 @@ jobs:
     steps:
       - custom_attach_workspace
       - init_environment
-      - run: node scripts/build-packages-dist.js
+      - run: node scripts/build/build-packages-dist.js
 
       # Save the npm packages from //packages/... for other workflow jobs to read
       - persist_to_workspace:
@@ -545,13 +547,14 @@ jobs:
     steps:
       - custom_attach_workspace
       - init_environment
-      - run: node scripts/build-ivy-npm-packages.js
+      - run: node scripts/build/build-ivy-npm-packages.js
 
       # Save the npm packages from //packages/... for other workflow jobs to read
       - persist_to_workspace:
           root: *workspace_location
           paths:
             - ng/dist/packages-dist-ivy-aot
+            - ng/dist/zone.js-dist-ivy-aot
 
   # We run a subset of the integration tests outside of Bazel that track
   # payload size.

.circleci/env.sh

@@ -68,7 +68,7 @@ setPublicVar COMPONENTS_REPO_TMP_DIR "/tmp/angular-components-repo"
 setPublicVar COMPONENTS_REPO_URL "https://github.com/angular/components.git"
 setPublicVar COMPONENTS_REPO_BRANCH "master"
 # **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI `config.yml`.
-setPublicVar COMPONENTS_REPO_COMMIT "2ec7254f88c4865e0de251f74c27e64c9d00d40a"
+setPublicVar COMPONENTS_REPO_COMMIT "598db096e668aa7e9debd56eedfd127b7a55e371"
 
 
 ####################################################################################################

.pullapprove.yml

@@ -546,7 +546,6 @@ groups:
     conditions:
       - >
         contains_any_globs(files, [
-          'modules/benchmarks_external/**',
           'modules/benchmarks/**'
           ])
     reviewers:
@@ -928,6 +927,7 @@ groups:
           '.github/**',
           '.vscode/**',
           '.yarn/**',
+          'dev-infra/**',
           'docs/BAZEL.md',
           'docs/CARETAKER.md',
           'docs/COMMITTER.md',
@@ -952,6 +952,7 @@ groups:
           'tools/browsers/**',
           'tools/build/**',
           'tools/circular_dependency_test/**',
+          'tools/contributing-stats/**',
           'tools/gulp-tasks/**',
           'tools/ng_rollup_bundle/**',
           'tools/ngcontainer/**',

CHANGELOG.md

@@ -1,3 +1,81 @@
+<a name="9.0.6"></a>
+## [9.0.6](https://github.com/angular/angular/compare/9.0.5...9.0.6) (2020-03-11)
+
+
+### Bug Fixes
+
+* **bazel:** do not use manifest paths for generated imports within compilation unit ([#35841](https://github.com/angular/angular/issues/35841)) ([5ea9a61](https://github.com/angular/angular/commit/5ea9a61))
+* **compiler:** process `imports` first and `declarations` second while calculating scopes ([#35850](https://github.com/angular/angular/issues/35850)) ([6f2fd6e](https://github.com/angular/angular/commit/6f2fd6e)), closes [#35502](https://github.com/angular/angular/issues/35502)
+* **core:** add `noSideEffects()` to `make*Decorator()` functions ([#35769](https://github.com/angular/angular/issues/35769)) ([#35846](https://github.com/angular/angular/issues/35846)) ([4fe3f37](https://github.com/angular/angular/commit/4fe3f37))
+* **core:** add `noSideEffects()` to `ɵɵdefineComponent()` ([#35769](https://github.com/angular/angular/issues/35769)) ([#35846](https://github.com/angular/angular/issues/35846)) ([68ca32f](https://github.com/angular/angular/commit/68ca32f))
+* **core:** remove side effects from `ɵɵgetInheritedFactory()` ([#35769](https://github.com/angular/angular/issues/35769)) ([#35846](https://github.com/angular/angular/issues/35846)) ([000c834](https://github.com/angular/angular/commit/000c834))
+* **core:** remove side effects from `ɵɵNgOnChangesFeature()` ([#35769](https://github.com/angular/angular/issues/35769)) ([#35846](https://github.com/angular/angular/issues/35846)) ([d24ce21](https://github.com/angular/angular/commit/d24ce21))
+* **core:** undecorated-classes-with-di migration should handle libraries generated with CLI versions past v6.2.0 ([#35824](https://github.com/angular/angular/issues/35824)) ([eaf5b58](https://github.com/angular/angular/commit/eaf5b58)), closes [#34985](https://github.com/angular/angular/issues/34985)
+* **language-service:** resolve the variable from the template context first ([#35982](https://github.com/angular/angular/issues/35982)) ([f882ff0](https://github.com/angular/angular/commit/f882ff0))
+* **localize:** improve matching and parsing of XLIFF 1.2 translation files ([#35793](https://github.com/angular/angular/issues/35793)) ([677d666](https://github.com/angular/angular/commit/677d666))
+* **localize:** improve matching and parsing of XLIFF 2.0 translation files ([#35793](https://github.com/angular/angular/issues/35793)) ([689964b](https://github.com/angular/angular/commit/689964b))
+* **localize:** improve matching and parsing of XTB translation files ([#35793](https://github.com/angular/angular/issues/35793)) ([9f68ff9](https://github.com/angular/angular/commit/9f68ff9))
+* **localize:** merge translation from all  XLIFF `<file>` elements ([#35936](https://github.com/angular/angular/issues/35936)) ([83d7819](https://github.com/angular/angular/commit/83d7819)), closes [#35839](https://github.com/angular/angular/issues/35839)
+* **platform-browser:** add missing peerDependency on `[@angular](https://github.com/angular)/animations` ([#35949](https://github.com/angular/angular/issues/35949)) ([db9704a](https://github.com/angular/angular/commit/db9704a)), closes [#35888](https://github.com/angular/angular/issues/35888)
+* **router:** state data missing in routerLink ([#33203](https://github.com/angular/angular/issues/33203)) ([773d7b8](https://github.com/angular/angular/commit/773d7b8))
+
+
+### Performance Improvements
+
+* **ngcc:** reduce directory traversing ([#35756](https://github.com/angular/angular/issues/35756)) ([2eaf420](https://github.com/angular/angular/commit/2eaf420)), closes [#35717](https://github.com/angular/angular/issues/35717)
+
+
+
+<a name="9.0.5"></a>
+## [9.0.5](https://github.com/angular/angular/compare/9.0.4...9.0.5) (2020-03-04)
+
+
+### Bug Fixes
+
+* **animations:** allow computeStyle to work on elements created in Node ([#35810](https://github.com/angular/angular/issues/35810)) ([2b63b7f](https://github.com/angular/angular/commit/2b63b7f))
+* **animations:** process shorthand `margin` and `padding` styles correctly ([#35701](https://github.com/angular/angular/issues/35701)) ([2e251b7](https://github.com/angular/angular/commit/2e251b7)), closes [#35463](https://github.com/angular/angular/issues/35463)
+* **bazel:** ng_package rule creates incorrect UMD module exports ([#35792](https://github.com/angular/angular/issues/35792)) ([c272351](https://github.com/angular/angular/commit/c272351)), closes [angular/components#18652](https://github.com/angular/components/issues/18652)
+* **compiler:** support i18n attributes on `<ng-template>` tags ([#35681](https://github.com/angular/angular/issues/35681)) ([d1966fc](https://github.com/angular/angular/commit/d1966fc))
+* **compiler:** type-checking error for duplicate variables in templates ([#35674](https://github.com/angular/angular/issues/35674)) ([1207295](https://github.com/angular/angular/commit/1207295)), closes [#35186](https://github.com/angular/angular/issues/35186)
+* **core:** allow null / undefined values in query results ([#35796](https://github.com/angular/angular/issues/35796)) ([120ce42](https://github.com/angular/angular/commit/120ce42)), closes [#35673](https://github.com/angular/angular/issues/35673)
+* **core:** handle `<ng-template>` with local refs in i18n blocks ([#35758](https://github.com/angular/angular/issues/35758)) ([5a14a15](https://github.com/angular/angular/commit/5a14a15))
+* **core:** log error instead of warning for unknown properties and elements ([#35798](https://github.com/angular/angular/issues/35798)) ([218e82e](https://github.com/angular/angular/commit/218e82e)), closes [#35699](https://github.com/angular/angular/issues/35699)
+* **core:** Remove `debugger` statement ([#35763](https://github.com/angular/angular/issues/35763)) ([e201a84](https://github.com/angular/angular/commit/e201a84)), closes [#35470](https://github.com/angular/angular/issues/35470)
+* **core:** Remove `debugger` statement when assert is thrown ([#35763](https://github.com/angular/angular/issues/35763)) ([d3ee052](https://github.com/angular/angular/commit/d3ee052)), closes [#35470](https://github.com/angular/angular/issues/35470)
+* **core:** treat `[class]` and `[className]` as unrelated bindings ([#35668](https://github.com/angular/angular/issues/35668)) ([48025eb](https://github.com/angular/angular/commit/48025eb)), closes [#35577](https://github.com/angular/angular/issues/35577)
+* **core:** unable to NgModuleRef.injector in module constructor ([#35731](https://github.com/angular/angular/issues/35731)) ([1980d69](https://github.com/angular/angular/commit/1980d69)), closes [#35677](https://github.com/angular/angular/issues/35677) [#35639](https://github.com/angular/angular/issues/35639)
+* **core:** use proper configuration to compile Injectable in JIT ([#35706](https://github.com/angular/angular/issues/35706)) ([df0859f](https://github.com/angular/angular/commit/df0859f))
+* **ivy:** narrow `NgIf` context variables in template type checker ([#35125](https://github.com/angular/angular/issues/35125)) ([fcad075](https://github.com/angular/angular/commit/fcad075)), closes [#34572](https://github.com/angular/angular/issues/34572)
+* **ivy:** support dynamic query tokens in AOT mode ([#35307](https://github.com/angular/angular/issues/35307)) ([52fc087](https://github.com/angular/angular/commit/52fc087)), closes [#34267](https://github.com/angular/angular/issues/34267)
+
+
+### Features
+
+* **language-service:** modularize error messages ([#35678](https://github.com/angular/angular/issues/35678)) ([bcff873](https://github.com/angular/angular/commit/bcff873)), closes [#32663](https://github.com/angular/angular/issues/32663)
+
+
+### Performance Improvements
+
+* **core:** add micro benchmark for destroy hook invocation ([#35784](https://github.com/angular/angular/issues/35784)) ([a07917b](https://github.com/angular/angular/commit/a07917b))
+* **core:** adding micro benchmark for host bindings ([#35705](https://github.com/angular/angular/issues/35705)) ([4ec7cd1](https://github.com/angular/angular/commit/4ec7cd1)), closes [#35568](https://github.com/angular/angular/issues/35568)
+* **core:** use multiple directives in host bindings micro benchmark ([#35736](https://github.com/angular/angular/issues/35736)) ([e13fcba](https://github.com/angular/angular/commit/e13fcba))
+* **ngcc:** only create tasks for non-processed formats ([#35719](https://github.com/angular/angular/issues/35719)) ([#35832](https://github.com/angular/angular/issues/35832)) ([3fdd304](https://github.com/angular/angular/commit/3fdd304))
+* **ngcc:** spawn workers lazily ([#35719](https://github.com/angular/angular/issues/35719)) ([#35832](https://github.com/angular/angular/issues/35832)) ([525dc6a](https://github.com/angular/angular/commit/525dc6a)), closes [#35717](https://github.com/angular/angular/issues/35717)
+
+
+
+<a name="9.0.4"></a>
+## [9.0.4](https://github.com/angular/angular/compare/9.0.3...9.0.4) (2020-02-27)
+
+
+### Bug Fixes
+
+* **ngcc:** allow deep-import warnings to be ignored ([#35683](https://github.com/angular/angular/issues/35683)) ([9064f4e](https://github.com/angular/angular/commit/9064f4e)), closes [#35615](https://github.com/angular/angular/issues/35615)
+* **ngcc:** handle mappings outside the content when flattening source-maps ([#35718](https://github.com/angular/angular/issues/35718)) ([bfe7657](https://github.com/angular/angular/commit/bfe7657)), closes [#35709](https://github.com/angular/angular/issues/35709)
+* **ngcc:** handle missing sources when flattening source-maps ([#35718](https://github.com/angular/angular/issues/35718)) ([7ff845b](https://github.com/angular/angular/commit/7ff845b)), closes [#35709](https://github.com/angular/angular/issues/35709)
+
+
+
 <a name="9.0.3"></a>
 ## [9.0.3](https://github.com/angular/angular/compare/9.0.2...9.0.3) (2020-02-27)
 

CONTRIBUTING.md

@@ -232,8 +232,8 @@ There are currently a few exceptions to the "use package name" rule:
 * **changelog**: used for updating the release notes in CHANGELOG.md
 * **docs-infra**: used for docs-app (angular.io) related changes within the /aio directory of the
   repo
-* **ivy**: used for changes to the [Ivy renderer](https://github.com/angular/angular/issues/21706).
 * **ngcc**: used for changes to the [Angular Compatibility Compiler](./packages/compiler-cli/ngcc/README.md)
+* **ve**: used for changes specific to ViewEngine (legacy compiler/renderer).
 * none/empty string: useful for `style`, `test` and `refactor` changes that are done across all
   packages (e.g. `style: add missing semicolons`) and for docs changes that are not related to a
   specific package (e.g. `docs: fix typo in tutorial`).

aio/content/examples/dependency-injection/src/app/providers.component.ts

@@ -158,11 +158,11 @@ export class Provider6bComponent {
 
 // #docregion silent-logger
 // An object in the shape of the logger service
-export function SilentLoggerFn() {}
+function silentLoggerFn() {}
 
-const silentLogger = {
+export const SilentLogger = {
   logs: ['Silent logger says "Shhhhh!". Provided via "useValue"'],
-  log: SilentLoggerFn
+  log: silentLoggerFn
 };
 // #enddocregion silent-logger
 
@@ -171,7 +171,7 @@ const silentLogger = {
   template: template,
   providers:
     // #docregion providers-7
-    [{ provide: Logger, useValue: silentLogger }]
+    [{ provide: Logger, useValue: SilentLogger }]
     // #enddocregion providers-7
 })
 export class Provider7Component {

aio/content/examples/http/src/app/heroes/heroes.service.spec.ts

@@ -28,9 +28,9 @@ describe('HeroesService', () => {
 
     // Inject the http, test controller, and service-under-test
     // as they will be referenced by each test.
-    httpClient = TestBed.get(HttpClient);
+    httpClient = TestBed.inject(HttpClient);
-    httpTestingController = TestBed.get(HttpTestingController);
+    httpTestingController = TestBed.inject(HttpTestingController);
-    heroService = TestBed.get(HeroesService);
+    heroService = TestBed.inject(HeroesService);
   });
 
   afterEach(() => {
@@ -44,7 +44,7 @@ describe('HeroesService', () => {
     let expectedHeroes: Hero[];
 
     beforeEach(() => {
-      heroService = TestBed.get(HeroesService);
+      heroService = TestBed.inject(HeroesService);
       expectedHeroes = [
         { id: 1, name: 'A' },
         { id: 2, name: 'B' },

aio/content/examples/http/src/testing/http-client.spec.ts

@@ -27,8 +27,8 @@ describe('HttpClient testing', () => {
     });
 
     // Inject the http service and test controller for each test
-    httpClient = TestBed.get(HttpClient);
+    httpClient = TestBed.inject(HttpClient);
-    httpTestingController = TestBed.get(HttpTestingController);
+    httpTestingController = TestBed.inject(HttpTestingController);
   });
   // #enddocregion setup
   // #docregion afterEach

aio/content/examples/testing/src/app/shared/canvas.component.spec.ts

@@ -1,6 +1,21 @@
+// #docplaster
+// #docregion without-toBlob-macrotask
 import { TestBed, async, tick, fakeAsync } from '@angular/core/testing';
 import { CanvasComponent } from './canvas.component';
+
 describe('CanvasComponent', () => {
+  // #enddocregion without-toBlob-macrotask
+  // #docregion enable-toBlob-macrotask
+  beforeEach(() => {
+    window['__zone_symbol__FakeAsyncTestMacroTask'] = [
+      {
+        source: 'HTMLCanvasElement.toBlob',
+        callbackArgs: [{ size: 200 }],
+      },
+    ];
+  });
+  // #enddocregion enable-toBlob-macrotask
+  // #docregion without-toBlob-macrotask
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [
@@ -8,20 +23,16 @@ describe('CanvasComponent', () => {
       ],
     }).compileComponents();
   }));
-  beforeEach(() => {
+
-    window['__zone_symbol__FakeAsyncTestMacroTask'] = [
-      {
-        source: 'HTMLCanvasElement.toBlob',
-        callbackArgs: [{ size: 200 }]
-      }
-    ];
-  });
   it('should be able to generate blob data from canvas', fakeAsync(() => {
     const fixture = TestBed.createComponent(CanvasComponent);
+    const canvasComp = fixture.debugElement.componentInstance;
+
     fixture.detectChanges();
+    expect(canvasComp.blobSize).toBe(0);
+
     tick();
-    const app = fixture.debugElement.componentInstance;
+    expect(canvasComp.blobSize).toBeGreaterThan(0);
-    expect(app.blobSize).toBeGreaterThan(0);
   }));
 });
-
+// #enddocregion without-toBlob-macrotask

aio/content/examples/testing/src/app/shared/canvas.component.ts

@@ -1,25 +1,32 @@
+// #docplaster
+// #docregion import-canvas-patch
+// Import patch to make async `HTMLCanvasElement` methods (such as `.toBlob()`) Zone.js-aware.
+// Either import in `polyfills.ts` (if used in more than one places in the app) or in the component
+// file using `HTMLCanvasElement` (if it is only used in a single file).
+import 'zone.js/dist/zone-patch-canvas';
+// #enddocregion import-canvas-patch
+// #docregion main
 import { Component, AfterViewInit, ViewChild, ElementRef } from '@angular/core';
 
 @Component({
   selector: 'sample-canvas',
-  template: '<canvas #sampleCanvas width="200" height="200"></canvas>'
+  template: '<canvas #sampleCanvas width="200" height="200"></canvas>',
 })
 export class CanvasComponent implements AfterViewInit {
-  blobSize: number;
+  blobSize = 0;
   @ViewChild('sampleCanvas') sampleCanvas: ElementRef;
 
-  constructor() { }
-
   ngAfterViewInit() {
-    const canvas = this.sampleCanvas.nativeElement;
+    const canvas: HTMLCanvasElement = this.sampleCanvas.nativeElement;
     const context = canvas.getContext('2d');
-    if (context) {
+
-      context.clearRect(0, 0, 200, 200);
+    context.clearRect(0, 0, 200, 200);
-      context.fillStyle = '#FF1122';
+    context.fillStyle = '#FF1122';
-      context.fillRect(0, 0, 200, 200);
+    context.fillRect(0, 0, 200, 200);
-      canvas.toBlob((blob: any) => {
+
-        this.blobSize = blob.size;
+    canvas.toBlob(blob => {
-      });
+      this.blobSize = blob.size;
-    }
+    });
   }
 }
+// #enddocregion main

aio/content/guide/http.md

@@ -185,7 +185,7 @@ searchHeroes(term: string): Observable {
 
   let heroesURL = `${this.heroesURL}?${term}`;
   return this.http.jsonp(heroesUrl, 'callback').pipe(
-      catchError(this.handleError('searchHeroes', []) // then handle the error
+      catchError(this.handleError('searchHeroes', [])) // then handle the error
     );
 };
 ```

aio/content/guide/singleton-services.md

@@ -9,7 +9,7 @@ For a sample app using the app-wide singleton service that this page describes,
 
 There are two ways to make a service a singleton in Angular:
 
-* Declare `root` for the value of the `@Injectable()` `providedIn` property
+* Set the `providedIn` property of the `@Injectable()` to `"root"`.
 * Include the service in the `AppModule` or in a module that is only imported by the `AppModule`
 
 

aio/content/guide/template-syntax.md

@@ -1065,7 +1065,7 @@ However, using the above style binding syntax without `NgStyle` is preferred bec
 {@a styling-precedence}
 ### Styling Precedence
 
-A single HTML element can have its CSS class list and style values bound to a multiple sources (for example, host bindings from multiple directives).
+A single HTML element can have its CSS class list and style values bound to multiple sources (for example, host bindings from multiple directives).
 
 When there are multiple bindings to the same class name or style property, Angular uses a set of precedence rules to resolve conflicts and determine which classes or styles are ultimately applied to the element.
 

aio/content/guide/testing.md

@@ -899,8 +899,7 @@ In production, change detection kicks in automatically
 when Angular creates a component or the user enters a keystroke or
 an asynchronous activity (e.g., AJAX) completes.
 
-The `TestBed.createComponent` does _not_ trigger change detection.
+The `TestBed.createComponent` does _not_ trigger change detection; a fact confirmed in the revised test:
-a fact confirmed in the revised test:
 
 <code-example
   path="testing/src/app/banner/banner.component.spec.ts" region="test-w-o-detect-changes"></code-example>
@@ -1051,8 +1050,7 @@ attempt to reach an authentication server.
 These behaviors can be hard to intercept.
 It is far easier and safer to create and register a test double in place of the real `UserService`.
 
-This particular test suite supplies a minimal mock of the `UserService` that satisfies the needs of the `WelcomeComponent`
+This particular test suite supplies a minimal mock of the `UserService` that satisfies the needs of the `WelcomeComponent` and its tests:
-and its tests:
 
 <code-example
   path="testing/src/app/welcome/welcome.component.spec.ts"
@@ -1266,8 +1264,7 @@ You do have to call [tick()](api/core/testing/tick) to advance the (virtual) clo
 Calling [tick()](api/core/testing/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()](api/core/testing/tick) function accepts milliseconds and tickOptions as parameters, the millisecond (defaults to 0 if not provided) 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. The tickOptions is an optional parameter with a property called processNewMacroTasksSynchronously (defaults is true) represents whether to invoke
+The [tick()](api/core/testing/tick) function accepts milliseconds and tickOptions as parameters, the millisecond (defaults to 0 if not provided) 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. The tickOptions is an optional parameter with a property called `processNewMacroTasksSynchronously` (defaults to true) represents whether to invoke new generated macro tasks when ticking.
-new generated macro tasks when ticking.
 
 <code-example
   path="testing/src/app/demo/async-helper.spec.ts"
@@ -1331,51 +1328,46 @@ You can also use RxJS scheduler in `fakeAsync()` just like using `setTimeout()`
 
 #### Support more macroTasks
 
-By default `fakeAsync()` supports the following `macroTasks`.
+By default, `fakeAsync()` supports the following macro tasks.
 
-- setTimeout
+- `setTimeout`
-- setInterval
+- `setInterval`
-- requestAnimationFrame
+- `requestAnimationFrame`
-- webkitRequestAnimationFrame
+- `webkitRequestAnimationFrame`
-- mozRequestAnimationFrame
+- `mozRequestAnimationFrame`
 
-If you run other `macroTask` such as `HTMLCanvasElement.toBlob()`, `Unknown macroTask scheduled in fake async test` error will be thrown.
+If you run other macro tasks such as `HTMLCanvasElement.toBlob()`, an _"Unknown macroTask scheduled in fake async test"_ error will be thrown.
 
 <code-tabs>
   <code-pane
+    header="src/app/shared/canvas.component.spec.ts (failing)"
     path="testing/src/app/shared/canvas.component.spec.ts"
-    header="src/app/shared/canvas.component.spec.ts">
+    region="without-toBlob-macrotask">
   </code-pane>
   <code-pane
+    header="src/app/shared/canvas.component.ts"
     path="testing/src/app/shared/canvas.component.ts"
-    header="src/app/shared/canvas.component.ts">
+    region="main">
   </code-pane>
 </code-tabs>
 
-If you want to support such a case, you need to define the `macroTask` you want to support in `beforeEach()`.
+If you want to support such a case, you need to define the macro task you want to support in `beforeEach()`.
 For example:
 
-```javascript
+<code-example
-beforeEach(() => {
+  header="src/app/shared/canvas.component.spec.ts (excerpt)"
-  window['__zone_symbol__FakeAsyncTestMacroTask'] = [
+  path="testing/src/app/shared/canvas.component.spec.ts"
-    {
+  region="enable-toBlob-macrotask">
-      source: 'HTMLCanvasElement.toBlob',
+</code-example>
-      callbackArgs: [{ size: 200 }]
+
-    }
+Note that in order to make the `<canvas>` element Zone.js-aware in your app, you need to import the `zone-patch-canvas` patch (either in `polyfills.ts` or in the specific file that uses `<canvas>`):
-  ];
+
-});
+<code-example
+  header="src/polyfills.ts or src/app/shared/canvas.component.ts"
+  path="testing/src/app/shared/canvas.component.ts"
+  region="import-canvas-patch">
+</code-example>
 
-it('toBlob should be able to run in fakeAsync', fakeAsync(() => {
-    const canvas: HTMLCanvasElement = document.getElementById('canvas') as HTMLCanvasElement;
-    let blob = null;
-    canvas.toBlob(function(b) {
-      blob = b;
-    });
-    tick();
-    expect(blob.size).toBe(200);
-  })
-);
-```
 
 #### Async observables
 
@@ -3635,7 +3627,7 @@ next to their corresponding helper files.
 #### Keep it simple
 
 [Component class testing](#component-class-testing) should be kept very clean and simple.
-It should test only a single unit. On a first glance, you should be able to understand 
+It should test only a single unit. On a first glance, you should be able to understand
 what the test is testing. If it's doing more, then it doesn't belong here.
 
 {@a q-end-to-end}

aio/content/guide/zone.md

@@ -218,7 +218,7 @@ zone.run(() => {
 This new context, `zoneThis`, can be retrieved from the `setTimeout()` callback function, and this context is the same when the `setTimeout()` is scheduled.
 To get the context, you can call [`Zone.current`](https://github.com/angular/angular/blob/master/packages/zone.js/lib/zone.ts).
 
-### Zones and async lifecycle hooks
+## Zones and async lifecycle hooks
 
 Zone.js can create contexts that persist across asynchronous operations as well as provide lifecycle hooks for asynchronous operations.
 
@@ -296,14 +296,14 @@ Monkey patching is a technique to add or modify the default behavior of a functi
 ## NgZone
 
 While Zone.js can monitor all the states of synchronous and asynchronous operations, Angular additionally provides a service called NgZone.
-This service creates a zone named `angular` to automatically trigger change detction when the following conditions are satisfied:
+This service creates a zone named `angular` to automatically trigger change detection when the following conditions are satisfied:
 
 1. When a sync or async function is executed.
 1. When there is no `microTask` scheduled.
 
 ### NgZone `run()`/`runOutsideOfAngular()`
 
-`Zone` handles most asynchronous APIs such as `setTimeout()`, `Promise.then(),and `addEventListener()`.
+`Zone` handles most asynchronous APIs such as `setTimeout()`, `Promise.then()`, and `addEventListener()`.
 For the full list, see the [Zone Module document](https://github.com/angular/angular/blob/master/packages/zone.js/MODULE.md).
 Therefore in those asynchronous APIs, you don't need to trigger change detection manually.
 
@@ -315,12 +315,12 @@ This function, and all asynchronous operations in that function, trigger change
 export class AppComponent implements OnInit {
   constructor(private ngZone: NgZone) {}
   ngOnInit() {
-    // new async API is not handled by Zone, so you need to
+    // New async API is not handled by Zone, so you need to
-    // use ngZone.run to make the asynchronous operation in angular zone
+    // use ngZone.run() to make the asynchronous operation in the angular zone
-    // and trigger change detection automatically
+    // and trigger change detection automatically.
     this.ngZone.run(() => {
       someNewAsyncAPI(() => {
-        // update data of component
+        // update the data of the component
       });
     });
   }
@@ -335,19 +335,20 @@ In that situation, you can use another NgZone method: [runOutsideAngular()](api/
 export class AppComponent implements OnInit {
   constructor(private ngZone: NgZone) {}
   ngOnInit() {
-    // you know no data will be updated
+    // You know no data will be updated,
-    // you don't want to do change detection in this
+    // so you don't want to trigger change detection in this
-    // specified operation, you can call runOutsideAngular
+    // specified operation. Instead, call ngZone.runOutsideAngular()
     this.ngZone.runOutsideAngular(() => {
       setTimeout(() => {
-        // do something will not update component data
+        // update component data
+        // but don't trigger change detection.
       });
     });
   }
 }
 ```
 
-### Seting up Zone.js
+### Setting up Zone.js
 
 To make Zone.js available in Angular, you need to import the zone.js package.
 If you are using the Angular CLI, this step is done automatically, and you will see the following line in the `src/polyfills.ts`:

aio/content/marketing/events.html

@@ -13,12 +13,6 @@
       </tr>
     </thead>
     <tbody>
-      <!-- ngIndia 2020 -->
-      <tr>
-        <th><a href="https://www.ng-ind.com/" title="ngIndia">ngIndia</a></th>
-        <td>Delhi, India</td>
-        <td>Feb 29, 2020</td>
-      </tr>
       <!-- ng-conf 2020 -->
       <tr>
         <th><a href="https://ng-conf.org/" title="ng-conf">ng-conf</a></th>
@@ -38,6 +32,12 @@
       </tr>
     </thead>
     <tbody>
+      <!-- ngIndia 2020 -->
+      <tr>
+        <th><a href="https://www.ng-ind.com/" title="ngIndia">ngIndia</a></th>
+        <td>Delhi, India</td>
+        <td>Feb 29, 2020</td>
+      </tr>
       <!-- ReactiveConf 2019 -->
       <tr>
         <th><a href="https://reactiveconf.com/" title="ReactiveConf">ReactiveConf</a></th>

aio/karma.conf.js

@@ -14,6 +14,9 @@ module.exports = function (config) {
       require('@angular-devkit/build-angular/plugins/karma'),
       {'reporter:jasmine-seed': ['type', JasmineSeedReporter]},
     ],
+    proxies: {
+      '/dummy/image': 'src/assets/images/logos/angular/angular.png',
+    },
     client: {
       clearContext: false,  // leave Jasmine Spec Runner output visible in browser
       jasmine: {

aio/scripts/_payload-limits.json

@@ -3,7 +3,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 2987,
-        "main-es2015": 449223,
+        "main-es2015": 450612,
         "polyfills-es2015": 52195
       }
     }
@@ -12,7 +12,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 2987,
-        "main-es2015": 450541,
+        "main-es2015": 451469,
         "polyfills-es2015": 52195
       }
     }
@@ -21,7 +21,7 @@
     "master": {
       "uncompressed": {
         "runtime-es2015": 3097,
-        "main-es2015": 426533,
+        "main-es2015": 429230,
         "polyfills-es2015": 52195
       }
     }

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

@@ -417,6 +417,15 @@ describe('AppComponent', () => {
         selectElement.triggerEventHandler('change', { option: versionWithoutUrl, index: versionWithoutUrlIndex });
         expect(locationService.go).not.toHaveBeenCalled();
       });
+
+      it('should navigate when change to a version with a url that does not end with `/`', async () => {
+        await setupSelectorForTesting();
+        locationService.urlSubject.next('docs#section-1');
+        const versionWithoutSlashIndex = component.docVersions.length;
+        const versionWithoutSlashUrl = component.docVersions[versionWithoutSlashIndex] = { url: 'https://next.angular.io', title: 'foo' };
+        selectElement.triggerEventHandler('change', { option: versionWithoutSlashUrl, index: versionWithoutSlashIndex });
+        expect(locationService.go).toHaveBeenCalledWith('https://next.angular.io/docs#section-1');
+      });
     });
 
     describe('currentDocument', () => {
@@ -792,7 +801,7 @@ describe('AppComponent', () => {
           const searchService = TestBed.inject(SearchService) as Partial<SearchService> as MockSearchService;
 
           const results = [
-            { path: 'news', title: 'News', type: 'marketing', keywords: '', titleWords: '', deprecated: false }
+            { path: 'news', title: 'News', type: 'marketing', keywords: '', titleWords: '', deprecated: false, topics: '' }
           ];
 
           searchService.searchResults.next({ query: 'something', results });

aio/src/app/app.component.ts

@@ -149,8 +149,8 @@ export class AppComponent implements OnInit {
     ]).subscribe(([versionInfo, versions]) => {
       // TODO(pbd): consider whether we can lookup the stable and next versions from the internet
       const computedVersions: NavigationNode[] = [
-        { title: 'next', url: 'https://next.angular.io' },
+        { title: 'next', url: 'https://next.angular.io/' },
-        { title: 'stable', url: 'https://angular.io' },
+        { title: 'stable', url: 'https://angular.io/' },
       ];
       if (this.deployment.mode === 'archive') {
         computedVersions.push({ title: `v${versionInfo.major}` });
@@ -232,7 +232,8 @@ export class AppComponent implements OnInit {
   onDocVersionChange(versionIndex: number) {
     const version = this.docVersions[versionIndex];
     if (version.url) {
-      this.locationService.go(`${version.url}${this.currentUrl}`);
+      const versionUrl = version.url  + (!version.url.endsWith('/') ? '/' : '');
+      this.locationService.go(`${versionUrl}${this.currentUrl}`);
     }
   }
 

aio/src/app/custom-elements/announcement-bar/announcement-bar.component.spec.ts

@@ -88,7 +88,7 @@ describe('AnnouncementBarComponent', () => {
   describe('rendering', () => {
     beforeEach(() => {
       component.announcement = {
-        imageUrl: 'link/to/image',
+        imageUrl: 'dummy/image',
         linkUrl: 'link/to/website',
         message: 'this is an <b>important</b> message',
         endDate: '2018-03-01',
@@ -102,7 +102,7 @@ describe('AnnouncementBarComponent', () => {
     });
 
     it('should display an image', () => {
-      expect(element.querySelector('img')!.src).toContain('link/to/image');
+      expect(element.querySelector('img')!.src).toContain('dummy/image');
     });
 
     it('should display a link', () => {

aio/src/app/search/interfaces.ts

@@ -9,6 +9,7 @@ export interface SearchResult {
   type: string;
   titleWords: string;
   keywords: string;
+  topics: string;
   deprecated: boolean;
 }
 

aio/src/app/search/search.worker.ts

@@ -15,6 +15,7 @@ interface PageInfo {
   type: string;
   titleWords: string;
   keyWords: string;
+  topics: string;
 }
 
 addEventListener('message', handleMessage);
@@ -27,6 +28,7 @@ function createIndex(loadIndexFn: IndexLoader): lunr.Index {
   queryLexer.termSeparator = lunr.tokenizer.separator = /\s+/;
   return lunr(/** @this */function() {
     this.ref('path');
+    this.field('topics', { boost: 15 });
     this.field('titleWords', { boost: 10 });
     this.field('headingWords', { boost: 5 });
     this.field('members', { boost: 4 });

aio/src/app/shared/search-results/search-results.component.html

@@ -1,30 +1,57 @@
-<div class="search-results">
+<div class="search-results" [ngSwitch]="searchState">
-  <div *ngIf="searchAreas.length; then searchResults; else notFound"></div>
+
+  <ng-container *ngSwitchCase="'in-progress'">
+    <p class="no-results">Searching ...</p>
+  </ng-container>
+
+  <ng-container *ngSwitchCase="'results-found'">
+    <h2 class="visually-hidden">Search Results</h2>
+    <div class="search-area" *ngFor="let area of searchAreas">
+      <h3 class="search-section-header">{{area.name}} ({{area.pages.length + area.priorityPages.length}})</h3>
+      <ul class="priority-pages" >
+        <li class="search-page" *ngFor="let page of area.priorityPages">
+          <a class="search-result-item" href="{{ page.path }}" (click)="onResultSelected(page, $event)">
+            <span class="symbol {{page.type}}" *ngIf="area.name === 'api'"></span>
+            <span [class.deprecated-api-item]="page.deprecated">{{ page.title }}</span>
+          </a>
+        </li>
+      </ul>
+      <ul>
+        <li class="search-page" *ngFor="let page of area.pages">
+          <a class="search-result-item" href="{{ page.path }}" (click)="onResultSelected(page, $event)">
+            <span class="symbol {{page.type}}" *ngIf="area.name === 'api'"></span>
+            <span [class.deprecated-api-item]="page.deprecated">{{ page.title }}</span>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </ng-container>
+  
+  <ng-container *ngSwitchCase="'no-results-found'">
+    <div class="search-area">
+      <p class="no-results">
+        No results found.<br>
+        Here are a few links that might be helpful in finding what you are looking for:
+      </p>
+      <ul class="priority-pages">
+        <li class="search-page">
+          <a class="search-result-item" href="api">API reference</a>
+        </li>
+        <li class="search-page">
+          <a class="search-result-item" href="resources">Resources</a>
+        </li>
+        <li class="search-page">
+          <a class="search-result-item" href="guide/glossary">Glossary</a>
+        </li>
+        <li class="search-page">
+          <a class="search-result-item" href="guide/cheatsheet">Cheat-sheet</a>
+        </li>
+        <li class="search-page">
+          <a class="search-result-item" href="https://blog.angular.io/">Angular blog</a>
+        </li>
+      </ul>
+    </div>
+  </ng-container>
 </div>
 
-<ng-template #searchResults>
-  <h2 class="visually-hidden">Search Results</h2>
-  <div class="search-area" *ngFor="let area of searchAreas">
-    <h3 class="search-section-header">{{area.name}} ({{area.pages.length + area.priorityPages.length}})</h3>
-    <ul class="priority-pages" >
-      <li class="search-page" *ngFor="let page of area.priorityPages">
-        <a class="search-result-item" href="{{ page.path }}" (click)="onResultSelected(page, $event)">
-          <span class="symbol {{page.type}}" *ngIf="area.name === 'api'"></span>
-          <span [class.deprecated-api-item]="page.deprecated">{{ page.title }}</span>
-        </a>
-      </li>
-    </ul>
-    <ul>
-      <li class="search-page" *ngFor="let page of area.pages">
-        <a class="search-result-item" href="{{ page.path }}" (click)="onResultSelected(page, $event)">
-          <span class="symbol {{page.type}}" *ngIf="area.name === 'api'"></span>
-          <span [class.deprecated-api-item]="page.deprecated">{{ page.title }}</span>
-        </a>
-      </li>
-    </ul>
-  </div>
-</ng-template>
 
-<ng-template #notFound>
-  <p class="not-found">{{notFoundMessage}}</p>
-</ng-template>

aio/src/app/shared/search-results/search-results.component.spec.ts

@@ -37,21 +37,21 @@ describe('SearchResultsComponent', () => {
 
   /** Get a full set of test results. "Take" what you need */
   beforeEach(() => {
-    apiD = { path: 'api/d', title: 'API D', deprecated: false, keywords: '', titleWords: '', type: '' };
+    apiD = { path: 'api/d', title: 'API D', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    apiC = { path: 'api/c', title: 'API C', deprecated: false, keywords: '', titleWords: '', type: '' };
+    apiC = { path: 'api/c', title: 'API C', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideA = { path: 'guide/a', title: 'Guide A', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideA = { path: 'guide/a', title: 'Guide A', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideB = { path: 'guide/b', title: 'Guide B', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideB = { path: 'guide/b', title: 'Guide B', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideAC = { path: 'guide/a/c', title: 'Guide A - C', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideAC = { path: 'guide/a/c', title: 'Guide A - C', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideE =  { path: 'guide/e', title: 'Guide e', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideE =  { path: 'guide/e', title: 'Guide e', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideF =  { path: 'guide/f', title: 'Guide f', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideF =  { path: 'guide/f', title: 'Guide f', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideG =  { path: 'guide/g', title: 'Guide g', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideG =  { path: 'guide/g', title: 'Guide g', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideH =  { path: 'guide/h', title: 'Guide h', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideH =  { path: 'guide/h', title: 'Guide h', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideI =  { path: 'guide/i', title: 'Guide i', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideI =  { path: 'guide/i', title: 'Guide i', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideJ =  { path: 'guide/j', title: 'Guide j', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideJ =  { path: 'guide/j', title: 'Guide j', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideK =  { path: 'guide/k', title: 'Guide k', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideK =  { path: 'guide/k', title: 'Guide k', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideL =  { path: 'guide/l', title: 'Guide l', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideL =  { path: 'guide/l', title: 'Guide l', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideM =  { path: 'guide/m', title: 'Guide m', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideM =  { path: 'guide/m', title: 'Guide m', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
-    guideN =  { path: 'guide/n', title: 'Guide n', deprecated: false, keywords: '', titleWords: '', type: '' };
+    guideN =  { path: 'guide/n', title: 'Guide n', deprecated: false, keywords: '', titleWords: '', type: '', topics: '' };
 
     standardResults = [
       guideA, apiD, guideB, guideAC, apiC, guideN, guideM, guideL, guideK, guideJ, guideI, guideH, guideG, guideF, guideE,
@@ -80,13 +80,13 @@ describe('SearchResultsComponent', () => {
 
   it('should special case results that are top level folders', () => {
     setSearchResults('', [
-      { path: 'tutorial', title: 'Tutorial index', type: '', keywords: '', titleWords: '', deprecated: false },
+      { path: 'tutorial', title: 'Tutorial index', type: '', keywords: '', titleWords: '', deprecated: false, topics: '' },
-      { path: 'tutorial/toh-pt1', title: 'Tutorial - part 1', type: '', keywords: '', titleWords: '', deprecated: false },
+      { path: 'tutorial/toh-pt1', title: 'Tutorial - part 1', type: '', keywords: '', titleWords: '', deprecated: false, topics: '' },
     ]);
     expect(component.searchAreas).toEqual([
       { name: 'tutorial', priorityPages: [
-        { path: 'tutorial', title: 'Tutorial index', type: '', keywords: '', titleWords: '', deprecated: false },
+        { path: 'tutorial', title: 'Tutorial index', type: '', keywords: '', titleWords: '', deprecated: false, topics: '' },
-        { path: 'tutorial/toh-pt1', title: 'Tutorial - part 1', type: '', keywords: '', titleWords: '', deprecated: false },
+        { path: 'tutorial/toh-pt1', title: 'Tutorial - part 1', type: '', keywords: '', titleWords: '', deprecated: false, topics: '' },
       ], pages: [] }
     ]);
   });
@@ -116,20 +116,20 @@ describe('SearchResultsComponent', () => {
 
   it('should put search results with no containing folder into the default area (other)', () => {
     const results = [
-      { path: 'news', title: 'News', type: 'marketing', keywords: '', titleWords: '', deprecated: false }
+      { path: 'news', title: 'News', type: 'marketing', keywords: '', titleWords: '', deprecated: false, topics: '' }
     ];
 
     setSearchResults('', results);
     expect(component.searchAreas).toEqual([
       { name: 'other', priorityPages: [
-        { path: 'news', title: 'News', type: 'marketing', keywords: '', titleWords: '', deprecated: false }
+        { path: 'news', title: 'News', type: 'marketing', keywords: '', titleWords: '', deprecated: false, topics: '' }
       ], pages: [] }
     ]);
   });
 
   it('should omit search results with no title', () => {
     const results = [
-      { path: 'news', title: '', type: 'marketing', keywords: '', titleWords: '', deprecated: false }
+      { path: 'news', title: '', type: 'marketing', keywords: '', titleWords: '', deprecated: false, topics: '' }
     ];
 
     setSearchResults('something', results);
@@ -170,6 +170,12 @@ describe('SearchResultsComponent', () => {
     expect(getText()).toContain('Searching ...');
   });
 
+  it('should not display default links while searching', () => {
+    fixture.detectChanges();
+    const resultLinks = fixture.debugElement.queryAll(By.css('.search-page a'));
+    expect(resultLinks.length).toEqual(0);
+  });
+
   describe('when a search result anchor is clicked', () => {
     let searchResult: SearchResult;
     let selected: SearchResult|null;
@@ -179,7 +185,7 @@ describe('SearchResultsComponent', () => {
       component.resultSelected.subscribe((result: SearchResult) => selected = result);
 
       selected = null;
-      searchResult = { path: 'news', title: 'News', type: 'marketing', keywords: '', titleWords: '', deprecated: false };
+      searchResult = { path: 'news', title: 'News', type: 'marketing', keywords: '', titleWords: '', deprecated: false, topics: '' };
       setSearchResults('something', [searchResult]);
 
       fixture.detectChanges();
@@ -214,9 +220,25 @@ describe('SearchResultsComponent', () => {
   });
 
   describe('when no query results', () => {
-    it('should display "not found" message', () => {
+    beforeEach(() => {
       setSearchResults('something', []);
+    });
+
+    it('should display "not found" message', () => {
       expect(getText()).toContain('No results');
     });
+
+    it('should contain reference links', () => {
+      const resultLinks = fixture.debugElement.queryAll(By.css('.search-page a'));
+      const resultHrefs = resultLinks.map(a => a.nativeNode.getAttribute('href'));
+      expect(resultHrefs.length).toEqual(5);
+      expect(resultHrefs).toEqual([
+        'api',
+        'resources',
+        'guide/glossary',
+        'guide/cheatsheet',
+        'https://blog.angular.io/',
+      ]);
+    });
   });
 });

aio/src/app/shared/search-results/search-results.component.ts

@@ -1,6 +1,12 @@
 import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
 import { SearchResult, SearchResults, SearchArea } from 'app/search/interfaces';
 
+enum SearchState {
+  InProgress = 'in-progress',
+  ResultsFound = 'results-found',
+  NoResultsFound = 'no-results-found'
+}
+
 /**
  * A component to display search results in groups
  */
@@ -23,11 +29,18 @@ export class SearchResultsComponent implements OnChanges {
   resultSelected = new EventEmitter<SearchResult>();
 
   readonly defaultArea = 'other';
-  notFoundMessage = 'Searching ...';
+  searchState: SearchState = SearchState.InProgress;
-  readonly topLevelFolders = ['guide', 'tutorial'];
+  readonly topLevelFolders = ['api', 'cli', 'guide', 'start', 'tutorial'];
   searchAreas: SearchArea[] = [];
 
   ngOnChanges() {
+    if (this.searchResults === null) {
+      this.searchState = SearchState.InProgress;
+    } else if (this.searchResults.results.length) {
+      this.searchState = SearchState.ResultsFound;
+    } else {
+      this.searchState = SearchState.NoResultsFound;
+    }
     this.searchAreas = this.processSearchResults(this.searchResults);
   }
 
@@ -43,7 +56,6 @@ export class SearchResultsComponent implements OnChanges {
     if (!search) {
       return [];
     }
-    this.notFoundMessage = 'No results found.';
     const searchAreaMap: { [key: string]: SearchResult[] } = {};
     search.results.forEach(result => {
       if (!result.title) { return; } // bad data; should fix

aio/src/styles/2-modules/_search-results.scss

@@ -67,12 +67,17 @@ aio-search-results {
       }
     }
 
-    .not-found {
+    .no-results {
       color: $white;
       text-align: center;
       margin: 16px;
     }
 
+    a {
+      color: $white;
+      font-weight: 500;
+    }
+
     @media (max-width: 600px) {
       display: block;
     }
@@ -101,9 +106,13 @@ aio-search-results {
         }
       }
 
-      .not-found {
+      .no-results {
         color: $darkgray;
       }
+
+      a {
+        color: $blue;
+      }
     }
   }
 }

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

@@ -11,15 +11,15 @@ const yargs = require('yargs');
 const PACKAGE_JSON = 'package.json';
 const YARN_LOCK = 'yarn.lock';
 const LOCAL_MARKER_PATH = 'node_modules/_local_.json';
-const PACKAGE_JSON_REGEX = /^[^/]+\/package\.json$/;
 
 const ANGULAR_ROOT_DIR = path.resolve(__dirname, '../../..');
-const ANGULAR_DIST_PACKAGES = path.join(ANGULAR_ROOT_DIR, 'dist/packages-dist');
+const ANGULAR_DIST_PACKAGES_DIR = path.join(ANGULAR_ROOT_DIR, 'dist/packages-dist');
-const ANGULAR_DIST_PACKAGES_BUILD_SCRIPT = path.join(ANGULAR_ROOT_DIR, 'scripts/build-packages-dist.js');
+const ZONEJS_DIST_PACKAGES_DIR = path.join(ANGULAR_ROOT_DIR, 'dist/zone.js-dist');
-const ANGULAR_DIST_PACKAGES_BUILD_CMD = `"${process.execPath}" "${ANGULAR_DIST_PACKAGES_BUILD_SCRIPT}"`;
+const DIST_PACKAGES_BUILD_SCRIPT = path.join(ANGULAR_ROOT_DIR, 'scripts/build/build-packages-dist.js');
+const DIST_PACKAGES_BUILD_CMD = `"${process.execPath}" "${DIST_PACKAGES_BUILD_SCRIPT}"`;
 
 /**
- * A tool that can install Angular dependencies for a project from NPM or from the
+ * A tool that can install Angular/Zone.js dependencies for a project from NPM or from the
  * locally built distributables.
  *
  * This tool is used to change dependencies of the `aio` application and the example
@@ -34,7 +34,7 @@ class NgPackagesInstaller {
    * @param {object} options - a hash of options for the install:
    *     * `debug` (`boolean`) - whether to display debug messages.
    *     * `force` (`boolean`) - whether to force a local installation even if there is a local marker file.
-   *     * `buildPackages` (`boolean`) - whether to build the local Angular packages before using them.
+   *     * `buildPackages` (`boolean`) - whether to build the local Angular/Zone.js packages before using them.
    *           (NOTE: Building the packages is currently not supported on Windows, so a message is printed instead.)
    *     * `ignorePackages` (`string[]`) - a collection of names of packages that should not be copied over.
    */
@@ -53,7 +53,7 @@ class NgPackagesInstaller {
 
   /**
    * Check whether the dependencies have been overridden with locally built
-   * Angular packages. This is done by checking for the `_local_.json` marker file.
+   * Angular/Zone.js packages. This is done by checking for the `_local_.json` marker file.
    * This will emit a warning to the console if the dependencies have been overridden.
    */
   checkDependencies() {
@@ -63,8 +63,8 @@ class NgPackagesInstaller {
   }
 
   /**
-   * Install locally built Angular dependencies, overriding the dependencies in the package.json
+   * Install locally built Angular/Zone.js dependencies, overriding the dependencies in the `package.json`.
-   * This will also write a "marker" file (`_local_.json`), which contains the overridden package.json
+   * This will also write a "marker" file (`_local_.json`), which contains the overridden `package.json`
    * contents and acts as an indicator that dependencies have been overridden.
    */
   installLocalDependencies() {
@@ -87,14 +87,14 @@ class NgPackagesInstaller {
           // Prevent accidental publishing of the package, if something goes wrong.
           tmpConfig.private = true;
 
-          // Overwrite project dependencies/devDependencies to Angular packages with local files.
+          // Overwrite project dependencies/devDependencies to Angular/Zone.js packages with local files.
           ['dependencies', 'devDependencies'].forEach(prop => {
             const deps = tmpConfig[prop] || {};
             Object.keys(deps).forEach(key2 => {
               const pkg2 = packages[key2];
               if (pkg2) {
-                // point the core Angular packages at the distributable folder
+                // point the local packages at the distributable folder
-                deps[key2] = `file:${pkg2.parentDir}/${key2.replace('@angular/', '')}`;
+                deps[key2] = `file:${pkg2.packageDir}`;
                 this._log(`Overriding dependency of local ${key} with local package: ${key2}: ${deps[key2]}`);
               }
             });
@@ -126,8 +126,8 @@ class NgPackagesInstaller {
           fs.writeFileSync(pathToPackageConfig, packageConfigFile);
         }
       } finally {
-        // Restore local Angular packages dependencies to other Angular packages.
+        // Restore local Angular/Zone.js packages dependencies to other Angular packages.
-        this._log(`Restoring original ${PACKAGE_JSON} for local Angular packages.`);
+        this._log(`Restoring original ${PACKAGE_JSON} for local packages.`);
         Object.keys(packages).forEach(key => {
           const pkg = packages[key];
           fs.writeFileSync(pkg.packageJsonPath, JSON.stringify(pkg.config, null, 2));
@@ -168,7 +168,7 @@ class NgPackagesInstaller {
   }
 
   /**
-   * Build the local Angular packages.
+   * Build the local Angular/Zone.js packages.
    *
    * NOTE:
    * Building the packages is currently not supported on Windows, so a message is printed instead, prompting the user to
@@ -178,14 +178,14 @@ class NgPackagesInstaller {
     const canBuild = process.platform !== 'win32';
 
     if (canBuild) {
-      this._log(`Building the Angular packages with: ${ANGULAR_DIST_PACKAGES_BUILD_SCRIPT}`);
+      this._log(`Building the local packages with: ${DIST_PACKAGES_BUILD_SCRIPT}`);
-      shelljs.exec(ANGULAR_DIST_PACKAGES_BUILD_CMD);
+      shelljs.exec(DIST_PACKAGES_BUILD_CMD);
     } else {
       this._warn([
-        'Automatically building the local Angular packages is currently not supported on Windows.',
+        'Automatically building the local Angular/Zone.js packages is currently not supported on Windows.',
-        `Please, ensure '${ANGULAR_DIST_PACKAGES}' exists and is up-to-date (e.g. by running ` +
+        `Please, ensure '${ANGULAR_DIST_PACKAGES_DIR}' and '${ZONEJS_DIST_PACKAGES_DIR}' exist and are up-to-date ` +
-          `'${ANGULAR_DIST_PACKAGES_BUILD_SCRIPT}' in Git Bash for Windows, Windows Subsystem for Linux or a Linux ` +
+          `(e.g. by running '${DIST_PACKAGES_BUILD_SCRIPT}' in Git Bash for Windows, Windows Subsystem for Linux or ` +
-          'docker container or VM).',
+          'a Linux docker container or VM).',
         '',
         'Proceeding anyway...',
       ].join('\n'));
@@ -200,12 +200,12 @@ class NgPackagesInstaller {
       const sourcePackage = packages[key];
       if (sourcePackage) {
         // point the core Angular packages at the distributable folder
-        mergedDependencies[key] = `file:${sourcePackage.parentDir}/${key.replace('@angular/', '')}`;
+        mergedDependencies[key] = `file:${sourcePackage.packageDir}`;
         this._log(`Overriding dependency with local package: ${key}: ${mergedDependencies[key]}`);
         // grab peer dependencies
         const sourcePackagePeerDeps = sourcePackage.config.peerDependencies || {};
         Object.keys(sourcePackagePeerDeps)
-          // ignore peerDependencies which are already core Angular packages
+          // ignore peerDependencies which are already core Angular/Zone.js packages
           .filter(key => !packages[key])
           .forEach(key => peerDependencies[key] = sourcePackagePeerDeps[key]);
       }
@@ -215,36 +215,52 @@ class NgPackagesInstaller {
   }
 
   /**
-   * A hash of Angular package configs.
+   * A hash of Angular/Zone.js package configs.
-   * (Detected as directories in '/dist/packages-dist/' that contain a top-level 'package.json' file.)
+   * (Detected as directories in '/dist/packages-dist/' and '/dist/zone.js-dist/' that contain a top-level
+   * 'package.json' file.)
    */
   _getDistPackages() {
-    const packageConfigs = Object.create(null);
+    this._log(`Angular distributable directory: ${ANGULAR_DIST_PACKAGES_DIR}.`);
-    const distDir = ANGULAR_DIST_PACKAGES;
+    this._log(`Zone.js distributable directory: ${ZONEJS_DIST_PACKAGES_DIR}.`);
-
-    this._log(`Angular distributable directory: ${distDir}.`);
 
     if (this.buildPackages) {
       this._buildDistPackages();
     }
 
-    shelljs
+    const collectPackages = containingDir => {
-      .find(distDir)
+      const packages = {};
-      .map(filePath => filePath.slice(distDir.length + 1))
+
-      .filter(filePath => PACKAGE_JSON_REGEX.test(filePath))
+      for (const dirName of shelljs.ls(containingDir)) {
-      .forEach(packagePath => {
+        const packageDir = path.resolve(containingDir, dirName);
-        const packageName = `@angular/${packagePath.slice(0, -PACKAGE_JSON.length -1)}`;
+        const packageJsonPath = path.join(packageDir, PACKAGE_JSON);
-        if (this.ignorePackages.indexOf(packageName) === -1) {
+        const packageConfig = fs.existsSync(packageJsonPath) ? require(packageJsonPath) : null;
-          const packageConfig = require(path.resolve(distDir, packagePath));
+        const packageName = packageConfig && packageConfig.name;
-          packageConfigs[packageName] = {
+
-            parentDir: distDir,
+        if (!packageConfig) {
-            packageJsonPath: path.resolve(distDir, packagePath),
+          // No `package.json` found - this directory is not a package.
-            config: packageConfig
+          continue;
-          };
+        } else if (!packageName) {
-        } else {
+          // No `name` property in `package.json`. (This should never happen.)
-          this._log('Ignoring package', packageName);
+          throw new Error(`Package '${packageDir}' specifies no name in its '${PACKAGE_JSON}'.`);
+        } else if (this.ignorePackages.includes(packageName)) {
+          this._log(`Ignoring package '${packageName}'.`);
+          continue;
         }
-      });
+
+        packages[packageName] = {
+          packageDir,
+          packageJsonPath,
+          config: packageConfig,
+        };
+      }
+
+      return packages;
+    };
+
+    const packageConfigs = {
+      ...collectPackages(ANGULAR_DIST_PACKAGES_DIR),
+      ...collectPackages(ZONEJS_DIST_PACKAGES_DIR),
+    };
 
     this._log('Found the following Angular distributables:', Object.keys(packageConfigs).map(key => `\n - ${key}`));
     return packageConfigs;
@@ -333,7 +349,7 @@ class NgPackagesInstaller {
 
     // Log a warning.
     this._warn([
-      `The project at "${absoluteProjectDir}" is running against the local Angular build.`,
+      `The project at "${absoluteProjectDir}" is running against the local Angular/Zone.js build.`,
       '',
       'To restore the npm packages run:',
       '',
@@ -386,10 +402,10 @@ function main() {
 
     .option('debug', { describe: 'Print additional debug information.', default: false })
     .option('force', { describe: 'Force the command to execute even if not needed.', default: false })
-    .option('build-packages', { describe: 'Build the local Angular packages, before using them.', default: false })
+    .option('build-packages', { describe: 'Build the local Angular/Zone.js packages, before using them.', default: false })
-    .option('ignore-packages', { describe: 'List of Angular packages that should not be used in local mode.', default: [], array: true })
+    .option('ignore-packages', { describe: 'List of Angular/Zone.js packages that should not be used in local mode.', default: [], array: true })
 
-    .command('overwrite <projectDir> [--force] [--debug] [--ignore-packages package1 package2]', 'Install dependencies from the locally built Angular distributables.', () => {}, argv => {
+    .command('overwrite <projectDir> [--force] [--debug] [--ignore-packages package1 package2]', 'Install dependencies from the locally built Angular/Zone.js distributables.', () => {}, argv => {
       createInstaller(argv).installLocalDependencies();
     })
     .command('restore <projectDir> [--debug]', 'Install dependencies from the npm registry.', () => {}, argv => {

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

@@ -15,6 +15,7 @@ describe('NgPackagesInstaller', () => {
   const yarnLockPath = path.resolve(absoluteProjectDir, 'yarn.lock');
   const ngRootDir = path.resolve(__dirname, '../../..');
   const packagesDir = path.join(ngRootDir, 'dist/packages-dist');
+  const zoneJsDir = path.join(ngRootDir, 'dist/zone.js-dist');
   const toolsDir = path.join(ngRootDir, 'dist/tools/@angular');
   let installer;
 
@@ -51,7 +52,7 @@ describe('NgPackagesInstaller', () => {
 
   describe('installLocalDependencies()', () => {
     const copyJsonObj = obj => JSON.parse(JSON.stringify(obj));
-    let dummyNgPackages, dummyPackage, dummyPackageJson, expectedModifiedPackage, expectedModifiedPackageJson;
+    let dummyLocalPackages, dummyPackage, dummyPackageJson, expectedModifiedPackage, expectedModifiedPackageJson;
 
     beforeEach(() => {
       spyOn(installer, '_checkLocalMarker');
@@ -60,34 +61,35 @@ describe('NgPackagesInstaller', () => {
 
       spyOn(installer, '_parseLockfile').and.returnValue({
         'rxjs@^6.3.0': {version: '6.3.3'},
-        'zone.js@^0.8.26': {version: '0.8.27'}
+        'rxjs-dev@^6.3.0': {version: '6.4.2'}
       });
 
       // These are the packages that are "found" in the dist directory
-      dummyNgPackages = {
+      dummyLocalPackages = {
         '@angular/core': {
-          parentDir: packagesDir,
+          packageDir: `${packagesDir}/core`,
           packageJsonPath: `${packagesDir}/core/package.json`,
           config: {
             peerDependencies: {
               'rxjs': '^6.4.0',
+              'rxjs-dev': '^6.4.0',
               'some-package': '5.0.1',
               'zone.js': '~0.8.26'
             }
           }
         },
         '@angular/common': {
-          parentDir: packagesDir,
+          packageDir: `${packagesDir}/common`,
           packageJsonPath: `${packagesDir}/common/package.json`,
           config: { peerDependencies: { '@angular/core': '4.4.4-1ab23cd4' } }
         },
         '@angular/compiler': {
-          parentDir: packagesDir,
+          packageDir: `${packagesDir}/compiler`,
           packageJsonPath: `${packagesDir}/compiler/package.json`,
           config: { peerDependencies: { '@angular/common': '4.4.4-1ab23cd4' } }
         },
         '@angular/compiler-cli': {
-          parentDir: toolsDir,
+          packageDir: `${toolsDir}/compiler-cli`,
           packageJsonPath: `${toolsDir}/compiler-cli/package.json`,
           config: {
             dependencies: { '@angular/tsc-wrapped': '4.4.4-1ab23cd4' },
@@ -95,38 +97,46 @@ describe('NgPackagesInstaller', () => {
           }
         },
         '@angular/tsc-wrapped': {
-          parentDir: toolsDir,
+          packageDir: `${toolsDir}/tsc-wrapped`,
           packageJsonPath: `${toolsDir}/tsc-wrapped/package.json`,
           config: {
             devDependencies: { '@angular/common': '4.4.4-1ab23cd4' },
             peerDependencies: { tsickle: '^1.4.0' }
           }
-        }
+        },
+        'zone.js': {
+          packageDir: `${zoneJsDir}/zone.js`,
+          packageJsonPath: `${zoneJsDir}/zone.js/package.json`,
+          config: {
+            devDependencies: { typescript: '^2.4.2' }
+          }
+        },
       };
-      spyOn(installer, '_getDistPackages').and.callFake(() => copyJsonObj(dummyNgPackages));
+      spyOn(installer, '_getDistPackages').and.callFake(() => copyJsonObj(dummyLocalPackages));
 
       // This is the package.json in the "test" folder
       dummyPackage = {
         dependencies: {
           '@angular/core': '4.4.1',
           '@angular/common': '4.4.1',
-          rxjs: '^6.3.0'
+          rxjs: '^6.3.0',
+          'zone.js': '^0.8.26'
         },
         devDependencies: {
           '@angular/compiler-cli': '4.4.1',
-          'zone.js': '^0.8.26'
+          'rxjs-dev': '^6.3.0'
         }
       };
       dummyPackageJson = JSON.stringify(dummyPackage);
       fs.readFileSync.and.returnValue(dummyPackageJson);
 
       // This is the package.json that is temporarily written to the "test" folder
-      // Note that the Angular (dev)dependencies have been modified to use a "file:" path
+      // Note that the Angular/Zone.js (dev)dependencies have been modified to use a "file:" path
-      // And that the peerDependencies from `dummyNgPackages` have been updated or added as
+      // and that the peerDependencies from `dummyLocalPackages` have been updated or added as
       // (dev)dependencies (unless the current version in lockfile satisfies semver).
       //
-      // For example, `zone.js@0.8.27` (from lockfile) satisfies `zone.js@~0.8.26` (from
+      // For example, `rxjs-dev@6.4.2` (from lockfile) satisfies `rxjs-dev@^6.4.0` (from
-      // `@angular/core`), thus `zone.js: ^0.8.26` (from original `package.json`) is retained.
+      // `@angular/core`), thus `rxjs-dev: ^6.3.0` (from original `package.json`) is retained.
       // In contrast, `rxjs@6.3.3` (from lockfile) does not satisfy `rxjs@^6.4.0 (from
       // `@angular/core`), thus `rxjs: ^6.3.0` (from original `package.json`) is replaced with
       // `rxjs: ^6.4.0` (from `@angular/core`).
@@ -134,11 +144,12 @@ describe('NgPackagesInstaller', () => {
         dependencies: {
           '@angular/core': `file:${packagesDir}/core`,
           '@angular/common': `file:${packagesDir}/common`,
-          'rxjs': '^6.4.0'
+          'rxjs': '^6.4.0',
+          'zone.js': `file:${zoneJsDir}/zone.js`,
         },
         devDependencies: {
           '@angular/compiler-cli': `file:${toolsDir}/compiler-cli`,
-          'zone.js': '^0.8.26',
+          'rxjs-dev': '^6.3.0',
           'some-package': '5.0.1',
           typescript: '^2.4.2'
         },
@@ -182,31 +193,56 @@ describe('NgPackagesInstaller', () => {
       });
 
       it('should temporarily overwrite the package.json files of local Angular packages', () => {
-        const pkgJsonFor = pkgName => dummyNgPackages[`@angular/${pkgName}`].packageJsonPath;
+        const pkgJsonPathFor = pkgName => dummyLocalPackages[pkgName].packageJsonPath;
-        const pkgConfigFor = pkgName => copyJsonObj(dummyNgPackages[`@angular/${pkgName}`].config);
+        const pkgConfigFor = pkgName => copyJsonObj(dummyLocalPackages[pkgName].config);
         const overwriteConfigFor = (pkgName, newProps) => Object.assign(pkgConfigFor(pkgName), newProps);
         const stringifyConfig = config => JSON.stringify(config, null, 2);
 
         const allArgs = fs.writeFileSync.calls.allArgs();
-        const firstFiveArgs = allArgs.slice(0, 5);
+        const firstSixArgs = allArgs.slice(0, 6);
-        const lastFiveArgs = allArgs.slice(-5);
+        const lastSixArgs = allArgs.slice(-6);
 
-        expect(firstFiveArgs).toEqual([
+        expect(firstSixArgs).toEqual([
-          [pkgJsonFor('core'), stringifyConfig(overwriteConfigFor('core', {private: true}))],
+          [
-          [pkgJsonFor('common'), stringifyConfig(overwriteConfigFor('common', {private: true}))],
+            pkgJsonPathFor('@angular/core'),
-          [pkgJsonFor('compiler'), stringifyConfig(overwriteConfigFor('compiler', {private: true}))],
+            stringifyConfig(overwriteConfigFor('@angular/core', {private: true})),
-          [pkgJsonFor('compiler-cli'), stringifyConfig(overwriteConfigFor('compiler-cli', {
+          ],
-            private: true,
+          [
-            dependencies: { '@angular/tsc-wrapped': `file:${toolsDir}/tsc-wrapped` }
+            pkgJsonPathFor('@angular/common'),
-          }))],
+            stringifyConfig(overwriteConfigFor('@angular/common', {private: true})),
-          [pkgJsonFor('tsc-wrapped'), stringifyConfig(overwriteConfigFor('tsc-wrapped', {
+          ],
-            private: true,
+          [
-            devDependencies: { '@angular/common': `file:${packagesDir}/common` }
+            pkgJsonPathFor('@angular/compiler'),
-          }))],
+            stringifyConfig(overwriteConfigFor('@angular/compiler', {private: true})),
+          ],
+          [
+            pkgJsonPathFor('@angular/compiler-cli'),
+            stringifyConfig(overwriteConfigFor('@angular/compiler-cli', {
+              private: true,
+              dependencies: { '@angular/tsc-wrapped': `file:${toolsDir}/tsc-wrapped` },
+            })),
+          ],
+          [
+            pkgJsonPathFor('@angular/tsc-wrapped'),
+            stringifyConfig(overwriteConfigFor('@angular/tsc-wrapped', {
+              private: true,
+              devDependencies: { '@angular/common': `file:${packagesDir}/common` },
+            })),
+          ],
+          [
+            pkgJsonPathFor('zone.js'),
+            stringifyConfig(overwriteConfigFor('zone.js', {private: true})),
+          ],
         ]);
 
-        expect(lastFiveArgs).toEqual(['core', 'common', 'compiler', 'compiler-cli', 'tsc-wrapped']
+        expect(lastSixArgs).toEqual([
-            .map(pkgName => [pkgJsonFor(pkgName), stringifyConfig(pkgConfigFor(pkgName))]));
+          '@angular/core',
+          '@angular/common',
+          '@angular/compiler',
+          '@angular/compiler-cli',
+          '@angular/tsc-wrapped',
+          'zone.js',
+        ].map(pkgName => [pkgJsonPathFor(pkgName), stringifyConfig(pkgConfigFor(pkgName))]));
       });
 
       it('should load the package.json', () => {
@@ -253,7 +289,7 @@ describe('NgPackagesInstaller', () => {
     };
 
     it('should build the local packages, when not on Windows', () => {
-      const buildScript = path.join(ngRootDir, 'scripts/build-packages-dist.js');
+      const buildScript = path.join(ngRootDir, 'scripts/build/build-packages-dist.js');
       const buildCmd = `"${process.execPath}" "${buildScript}"`;
 
       buildDistPackagesOnPlatform('linux');
@@ -280,7 +316,7 @@ describe('NgPackagesInstaller', () => {
 
       expect(shelljs.exec).not.toHaveBeenCalled();
       expect(warning).toContain(
-          'Automatically building the local Angular packages is currently not supported on Windows.');
+          'Automatically building the local Angular/Zone.js packages is currently not supported on Windows.');
       expect(warning).toContain('Git Bash for Windows');
       expect(warning).toContain('Windows Subsystem for Linux');
       expect(warning).toContain('Linux docker container or VM');
@@ -288,7 +324,10 @@ describe('NgPackagesInstaller', () => {
   });
 
   describe('_getDistPackages()', () => {
-    beforeEach(() => spyOn(NgPackagesInstaller.prototype, '_buildDistPackages'));
+    beforeEach(() => {
+      fs.existsSync.and.callThrough();
+      spyOn(NgPackagesInstaller.prototype, '_buildDistPackages');
+    });
 
     it('should not build the local packages by default', () => {
       installer._getDistPackages();
@@ -306,37 +345,39 @@ describe('NgPackagesInstaller', () => {
       expect(installer._buildDistPackages).not.toHaveBeenCalled();
     });
 
-    it('should include top level Angular packages', () => {
+    it('should include top level Angular and Zone.js packages', () => {
-      const ngPackages = installer._getDistPackages();
+      const localPackages = installer._getDistPackages();
       const expectedValue = jasmine.objectContaining({
-        parentDir: jasmine.any(String),
+        packageDir: jasmine.any(String),
         packageJsonPath: jasmine.any(String),
         config: jasmine.any(Object),
       });
 
       // For example...
-      expect(ngPackages['@angular/common']).toEqual(expectedValue);
+      expect(localPackages['@angular/common']).toEqual(expectedValue);
-      expect(ngPackages['@angular/core']).toEqual(expectedValue);
+      expect(localPackages['@angular/core']).toEqual(expectedValue);
-      expect(ngPackages['@angular/router']).toEqual(expectedValue);
+      expect(localPackages['@angular/router']).toEqual(expectedValue);
-      expect(ngPackages['@angular/upgrade']).toEqual(expectedValue);
+      expect(localPackages['@angular/upgrade']).toEqual(expectedValue);
+      expect(localPackages['zone.js']).toEqual(expectedValue);
 
-      expect(ngPackages['@angular/upgrade/static']).not.toBeDefined();
+      expect(localPackages['@angular/upgrade/static']).not.toBeDefined();
     });
 
-    it('should store each package\'s parent directory', () => {
+    it('should store each package\'s directory', () => {
-      const ngPackages = installer._getDistPackages();
+      const localPackages = installer._getDistPackages();
 
       // For example...
-      expect(ngPackages['@angular/core'].parentDir).toBe(packagesDir);
+      expect(localPackages['@angular/core'].packageDir).toBe(path.join(packagesDir, 'core'));
-      expect(ngPackages['@angular/router'].parentDir).toBeDefined(toolsDir);
+      expect(localPackages['@angular/router'].packageDir).toBe(path.join(packagesDir, 'router'));
+      expect(localPackages['zone.js'].packageDir).toBe(path.join(zoneJsDir, 'zone.js'));
     });
 
     it('should not include packages that have been ignored', () => {
       installer = new NgPackagesInstaller(projectDir, { ignorePackages: ['@angular/router'] });
-      const ngPackages = installer._getDistPackages();
+      const localPackages = installer._getDistPackages();
 
-      expect(ngPackages['@angular/common']).toBeDefined();
+      expect(localPackages['@angular/common']).toBeDefined();
-      expect(ngPackages['@angular/router']).toBeUndefined();
+      expect(localPackages['@angular/router']).toBeUndefined();
     });
   });
 
@@ -477,7 +518,7 @@ describe('NgPackagesInstaller', () => {
   describe('_printWarning()', () => {
     it('should mention the message passed in the warning', () => {
       installer._printWarning();
-      expect(console.warn.calls.argsFor(0)[0]).toContain('is running against the local Angular build');
+      expect(console.warn.calls.argsFor(0)[0]).toContain('is running against the local Angular/Zone.js build');
     });
 
     it('should mention the command to restore the Angular packages in any warning', () => {

aio/tools/transforms/angular-base-package/index.js

@@ -45,6 +45,11 @@ module.exports = new Package('angular-base', [
   .factory(require('./post-processors/add-image-dimensions'))
   .factory(require('./post-processors/auto-link-code'))
 
+  // Configure jsdoc-style tag parsing
+  .config(function(inlineTagProcessor) {
+    inlineTagProcessor.inlineTagDefinitions.push(require('./inline-tag-defs/custom-search-defs/'));
+  })
+
   .config(function(checkAnchorLinksProcessor) {
     // This is disabled here to prevent false negatives for the `docs-watch` task.
     // It is re-enabled in the main `angular.io-package`

aio/tools/transforms/angular-base-package/inline-tag-defs/custom-search-defs/index.js

@@ -0,0 +1,9 @@
+module.exports = {
+  name: 'searchKeywords',
+  description: 'A shorthand for creating elements with search terms. Usage: `{@searchKeywords term1 term2 termN }`',
+  handler: function(doc, tagName, tagDescription) {
+    doc.searchKeywords = tagDescription;
+    return doc;
+  }
+};
+  

aio/tools/transforms/angular-base-package/processors/generateKeywords.js

@@ -91,7 +91,8 @@ module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
           titleWords: tokenize(doc.searchTitle).join(' '),
           headingWords: headingWords.sort().join(' '),
           keywords: words.sort().join(' '),
-          members: members.sort().join(' ')
+          members: members.sort().join(' '),
+          topics: doc.searchKeywords
         };
 
       });

aio/tools/transforms/cli-docs-package/processors/processCliCommands.js

@@ -4,10 +4,14 @@ module.exports = function processCliCommands(createDocMessage) {
     $runBefore: ['rendering-docs'],
     $process(docs) {
       const navigationDoc = docs.find(doc => doc.docType === 'navigation-json');
-      const navigationNode = navigationDoc && navigationDoc.data['SideNav'].find(node => node.children && node.children.length && node.children[0].url === 'cli');
+      const navigationNode = navigationDoc &&
+          navigationDoc.data['SideNav'].find(
+              node => node.children && node.children.length && node.children[0].url === 'cli');
 
       if (!navigationNode) {
-        throw new Error(createDocMessage('Missing `cli` url - CLI Commands must include a first child node with url set at `cli`', navigationDoc));
+        throw new Error(createDocMessage(
+            'Missing `cli` url - CLI Commands must include a first child node with url set at `cli`',
+            navigationDoc));
       }
 
       docs.forEach(doc => {
@@ -15,26 +19,31 @@ module.exports = function processCliCommands(createDocMessage) {
           doc.names = collectNames(doc.name, doc.commandAliases);
 
           // Recursively process the options
-          processOptions(doc, doc.options);
+          const optionKeywords = new Set();
+          processOptions(doc, doc.options, optionKeywords);
+          doc.optionKeywords = Array.from(optionKeywords).join(' ');
 
           // Add to navigation doc
-          navigationNode.children.push({ url: doc.path, title: `ng ${doc.name}` });
+          navigationNode.children.push({url: doc.path, title: `ng ${doc.name}`});
         }
       });
     }
   };
 };
 
-function processOptions(container, options) {
+function processOptions(container, options, optionKeywords) {
   container.positionalOptions = [];
   container.namedOptions = [];
 
   options.forEach(option => {
     // Ignore any hidden options
-    if (option.hidden) { return; }
+    if (option.hidden) {
+      return;
+    }
 
     option.types = option.types || [option.type];
     option.names = collectNames(option.name, option.aliases);
+    option.names.forEach(name => optionKeywords.add(name));
 
     // Now work out what kind of option it is: positional/named
     if (option.positional !== undefined) {
@@ -48,7 +57,8 @@ function processOptions(container, options) {
       option.subcommands = getValues(option.subcommands);
       option.subcommands.forEach(subcommand => {
         subcommand.names = collectNames(subcommand.name, subcommand.aliases);
-        processOptions(subcommand, subcommand.options);
+        subcommand.names.forEach(name => optionKeywords.add(name));
+        processOptions(subcommand, subcommand.options, optionKeywords);
       });
     }
   });
@@ -57,7 +67,7 @@ function processOptions(container, options) {
 }
 
 function collectNames(name, aliases) {
-  return [name].concat(aliases);
+  return [name].concat(aliases || []);
 }
 
 function getValues(obj) {

aio/tools/transforms/cli-docs-package/processors/processCliCommands.spec.js

@@ -7,11 +7,7 @@ describe('processCliCommands processor', () => {
 
   const navigationStub = {
     docType: 'navigation-json',
-    data: {
+    data: {SideNav: [{children: [{'url': 'cli'}]}]}
-      SideNav: [{
-        children: [{'url': 'cli'}]
-      }]
-    }
   };
 
   beforeEach(() => {
@@ -21,17 +17,13 @@ describe('processCliCommands processor', () => {
     createDocMessage = injector.get('createDocMessage');
   });
 
-  it('should be available on the injector', () => {
+  it('should be available on the injector', () => { expect(processor.$process).toBeDefined(); });
-    expect(processor.$process).toBeDefined();
-  });
 
-  it('should run after the correct processor', () => {
+  it('should run after the correct processor',
-    expect(processor.$runAfter).toEqual(['extra-docs-added']);
+     () => { expect(processor.$runAfter).toEqual(['extra-docs-added']); });
-  });
 
-  it('should run before the correct processor', () => {
+  it('should run before the correct processor',
-    expect(processor.$runBefore).toEqual(['rendering-docs']);
+     () => { expect(processor.$runBefore).toEqual(['rendering-docs']); });
-  });
 
   it('should collect the names (name + aliases)', () => {
     const doc = {
@@ -51,16 +43,16 @@ describe('processCliCommands processor', () => {
         name: 'name',
         commandAliases: [],
         options: [
-          { name: 'option1' },
+          {name: 'option1'},
-          { name: 'option2', hidden: true },
+          {name: 'option2', hidden: true},
-          { name: 'option3' },
+          {name: 'option3'},
-          { name: 'option4', hidden: true },
+          {name: 'option4', hidden: true},
         ],
       };
       processor.$process([doc, navigationStub]);
       expect(doc.namedOptions).toEqual([
-        jasmine.objectContaining({ name: 'option1' }),
+        jasmine.objectContaining({name: 'option1'}),
-        jasmine.objectContaining({ name: 'option3' }),
+        jasmine.objectContaining({name: 'option3'}),
       ]);
     });
 
@@ -70,18 +62,18 @@ describe('processCliCommands processor', () => {
         name: 'name',
         commandAliases: [],
         options: [
-          { name: 'named1' },
+          {name: 'named1'},
-          { name: 'positional1', positional: 0},
+          {name: 'positional1', positional: 0},
-          { name: 'named2', hidden: true },
+          {name: 'named2', hidden: true},
-          { name: 'positional2', hidden: true, positional: 1},
+          {name: 'positional2', hidden: true, positional: 1},
         ],
       };
       processor.$process([doc, navigationStub]);
       expect(doc.positionalOptions).toEqual([
-        jasmine.objectContaining({ name: 'positional1', positional: 0}),
+        jasmine.objectContaining({name: 'positional1', positional: 0}),
       ]);
       expect(doc.namedOptions).toEqual([
-        jasmine.objectContaining({ name: 'named1' }),
+        jasmine.objectContaining({name: 'named1'}),
       ]);
     });
 
@@ -91,18 +83,34 @@ describe('processCliCommands processor', () => {
         name: 'name',
         commandAliases: [],
         options: [
-          { name: 'c' },
+          {name: 'c'},
-          { name: 'a' },
+          {name: 'a'},
-          { name: 'b' },
+          {name: 'b'},
         ],
       };
       processor.$process([doc, navigationStub]);
       expect(doc.namedOptions).toEqual([
-        jasmine.objectContaining({ name: 'a' }),
+        jasmine.objectContaining({name: 'a'}),
-        jasmine.objectContaining({ name: 'b' }),
+        jasmine.objectContaining({name: 'b'}),
-        jasmine.objectContaining({ name: 'c' }),
+        jasmine.objectContaining({name: 'c'}),
       ]);
     });
+
+    it('should collect potential search terms from options for indexing', () => {
+      const doc = {
+        docType: 'cli-command',
+        name: 'name',
+        commandAliases: [],
+        options: [
+          {name: 'named1'},
+          {name: 'positional1', positional: 0},
+          {name: 'named2', hidden: true},
+          {name: 'positional2', hidden: true, positional: 1},
+        ],
+      };
+      processor.$process([doc, navigationStub]);
+      expect(doc.optionKeywords).toEqual('named1 positional1');
+    });
   });
 
   describe('subcommands', () => {
@@ -117,15 +125,15 @@ describe('processCliCommands processor', () => {
             subcommand1: {
               name: 'subcommand1',
               options: [
-                { name: 'subcommand1-option1' },
+                {name: 'subcommand1-option1'},
-                { name: 'subcommand1-option2' },
+                {name: 'subcommand1-option2'},
               ],
             },
             subcommand2: {
               name: 'subcommand2',
               options: [
-                { name: 'subcommand2-option1' },
+                {name: 'subcommand2-option1'},
-                { name: 'subcommand2-option2' },
+                {name: 'subcommand2-option2'},
               ],
             }
           },
@@ -133,8 +141,8 @@ describe('processCliCommands processor', () => {
       };
       processor.$process([doc, navigationStub]);
       expect(doc.options[0].subcommands).toEqual([
-        jasmine.objectContaining({ name: 'subcommand1' }),
+        jasmine.objectContaining({name: 'subcommand1'}),
-        jasmine.objectContaining({ name: 'subcommand2' }),
+        jasmine.objectContaining({name: 'subcommand2'}),
       ]);
     });
 
@@ -149,15 +157,15 @@ describe('processCliCommands processor', () => {
             subcommand1: {
               name: 'subcommand1',
               options: [
-                { name: 'subcommand1-option1' },
+                {name: 'subcommand1-option1'},
-                { name: 'subcommand1-option2', hidden: true },
+                {name: 'subcommand1-option2', hidden: true},
               ],
             },
             subcommand2: {
               name: 'subcommand2',
               options: [
-                { name: 'subcommand2-option1', hidden: true },
+                {name: 'subcommand2-option1', hidden: true},
-                { name: 'subcommand2-option2' },
+                {name: 'subcommand2-option2'},
               ],
             }
           },
@@ -165,10 +173,10 @@ describe('processCliCommands processor', () => {
       };
       processor.$process([doc, navigationStub]);
       expect(doc.options[0].subcommands[0].namedOptions).toEqual([
-        jasmine.objectContaining({ name: 'subcommand1-option1' }),
+        jasmine.objectContaining({name: 'subcommand1-option1'}),
       ]);
       expect(doc.options[0].subcommands[1].namedOptions).toEqual([
-        jasmine.objectContaining({ name: 'subcommand2-option2' }),
+        jasmine.objectContaining({name: 'subcommand2-option2'}),
       ]);
     });
 
@@ -183,15 +191,15 @@ describe('processCliCommands processor', () => {
             subcommand1: {
               name: 'subcommand1',
               options: [
-                { name: 'subcommand1-option1' },
+                {name: 'subcommand1-option1'},
-                { name: 'subcommand1-option2', positional: 0 },
+                {name: 'subcommand1-option2', positional: 0},
               ],
             },
             subcommand2: {
               name: 'subcommand2',
               options: [
-                { name: 'subcommand2-option1', hidden: true },
+                {name: 'subcommand2-option1', hidden: true},
-                { name: 'subcommand2-option2', hidden: true, positional: 1 },
+                {name: 'subcommand2-option2', hidden: true, positional: 1},
               ],
             }
           },
@@ -199,10 +207,10 @@ describe('processCliCommands processor', () => {
       };
       processor.$process([doc, navigationStub]);
       expect(doc.options[0].subcommands[0].positionalOptions).toEqual([
-        jasmine.objectContaining({ name: 'subcommand1-option2', positional: 0}),
+        jasmine.objectContaining({name: 'subcommand1-option2', positional: 0}),
       ]);
       expect(doc.options[0].subcommands[0].namedOptions).toEqual([
-        jasmine.objectContaining({ name: 'subcommand1-option1' }),
+        jasmine.objectContaining({name: 'subcommand1-option1'}),
       ]);
 
       expect(doc.options[0].subcommands[1].positionalOptions).toEqual([]);
@@ -220,9 +228,9 @@ describe('processCliCommands processor', () => {
             subcommand1: {
               name: 'subcommand1',
               options: [
-                { name: 'c' },
+                {name: 'c'},
-                { name: 'a' },
+                {name: 'a'},
-                { name: 'b' },
+                {name: 'b'},
               ]
             }
           }
@@ -230,47 +238,42 @@ describe('processCliCommands processor', () => {
       };
       processor.$process([doc, navigationStub]);
       expect(doc.options[0].subcommands[0].namedOptions).toEqual([
-        jasmine.objectContaining({ name: 'a' }),
+        jasmine.objectContaining({name: 'a'}),
-        jasmine.objectContaining({ name: 'b' }),
+        jasmine.objectContaining({name: 'b'}),
-        jasmine.objectContaining({ name: 'c' }),
+        jasmine.objectContaining({name: 'c'}),
       ]);
     });
   });
 
-  it('should add the command to the CLI node in the navigation doc if there is a first child node with a `cli` url', () => {
+  it('should add the command to the CLI node in the navigation doc if there is a first child node with a `cli` url',
-    const command = {
+     () => {
-      docType: 'cli-command',
+       const command = {
-      name: 'command1',
+         docType: 'cli-command',
-      commandAliases: ['alias1', 'alias2'],
+         name: 'command1',
-      options: [],
+         commandAliases: ['alias1', 'alias2'],
-      path: 'cli/command1',
+         options: [],
-    };
+         path: 'cli/command1',
-    const navigation = {
+       };
-      docType: 'navigation-json',
+       const navigation = {
-      data: {
+         docType: 'navigation-json',
-        SideNav: [
+         data: {
-          { url: 'some/page', title: 'Some Page' },
+           SideNav: [
-          {
+             {url: 'some/page', title: 'Some Page'}, {
-            title: 'CLI Commands',
+               title: 'CLI Commands',
-            tooltip: 'Angular CLI command reference',
+               tooltip: 'Angular CLI command reference',
-            children: [
+               children: [{'title': 'Overview', 'url': 'cli'}]
-              {
+             },
-                'title': 'Overview',
+             {url: 'other/page', title: 'Other Page'}
-                'url': 'cli'
+           ]
-              }
+         }
-            ]
+       };
-          },
+       processor.$process([command, navigation]);
-          { url: 'other/page', title: 'Other Page' }
+       expect(navigation.data.SideNav[1].title).toEqual('CLI Commands');
-        ]
+       expect(navigation.data.SideNav[1].children).toEqual([
-      }
+         {url: 'cli', title: 'Overview'},
-    };
+         {url: 'cli/command1', title: 'ng command1'},
-    processor.$process([command, navigation]);
+       ]);
-    expect(navigation.data.SideNav[1].title).toEqual('CLI Commands');
+     });
-    expect(navigation.data.SideNav[1].children).toEqual([
-      { url: 'cli', title: 'Overview' },
-      { url: 'cli/command1', title: 'ng command1' },
-    ]);
-  });
 
   it('should complain if there is no child with `cli` url', () => {
     const command = {
@@ -284,21 +287,50 @@ describe('processCliCommands processor', () => {
       docType: 'navigation-json',
       data: {
         SideNav: [
-          { url: 'some/page', title: 'Some Page' },
+          {url: 'some/page', title: 'Some Page'}, {
-          {
             title: 'CLI Commands',
             tooltip: 'Angular CLI command reference',
-            children: [
+            children: [{'title': 'Overview', 'url': 'client'}]
-              {
-                'title': 'Overview',
-                'url': 'client'
-              }
-            ]
           },
-          { url: 'other/page', title: 'Other Page' }
+          {url: 'other/page', title: 'Other Page'}
         ]
       }
     };
-    expect(() => processor.$process([command, navigation])).toThrowError(createDocMessage('Missing `cli` url - CLI Commands must include a first child node with url set at `cli`', navigation));
+    expect(() => processor.$process([command, navigation]))
+        .toThrowError(createDocMessage(
+            'Missing `cli` url - CLI Commands must include a first child node with url set at `cli`',
+            navigation));
   });
+
+  it('should collect potential search terms from options for indexing', () => {
+    const doc = {
+      docType: 'cli-command',
+      name: 'name',
+      commandAliases: [],
+      options: [{
+        name: 'supercommand',
+        subcommands: {
+          subcommand1: {
+            name: 'subcommand1',
+            options: [
+              {name: 'subcommand1-option1'},
+              {name: 'subcommand1-option2'},
+            ],
+          },
+          subcommand2: {
+            name: 'subcommand2',
+            options: [
+              {name: 'subcommand2-option1'},
+              {name: 'subcommand2-option2'},
+            ],
+          }
+        },
+      }],
+    };
+    processor.$process([doc, navigationStub]);
+    expect(doc.optionKeywords)
+        .toEqual(
+            'supercommand subcommand1 subcommand1-option1 subcommand1-option2 subcommand2 subcommand2-option1 subcommand2-option2');
+  });
+
 });

dev-infra/BUILD.bazel

@@ -0,0 +1,38 @@
+load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm_bazel_rollup//:index.bzl", "rollup_bundle")
+
+ts_library(
+    name = "cli",
+    srcs = [
+        "cli.ts",
+    ],
+    deps = [
+        "//dev-infra/pullapprove",
+        "@npm//@types/node",
+    ],
+)
+
+rollup_bundle(
+    name = "bundle",
+    config_file = "rollup.config.js",
+    entry_point = ":cli.ts",
+    format = "umd",
+    sourcemap = "hidden",
+    deps = [
+        ":cli",
+        "@npm//rollup-plugin-commonjs",
+        "@npm//rollup-plugin-node-resolve",
+    ],
+)
+
+pkg_npm(
+    name = "npm_package",
+    srcs = [
+        "package.json",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":bundle",
+    ],
+)

dev-infra/cli.ts

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {verify} from './pullapprove/verify';
+
+const args = process.argv.slice(2);
+
+
+// TODO(josephperrott): Set up proper cli flag/command handling
+switch (args[0]) {
+  case 'pullapprove:verify':
+    verify();
+    break;
+  default:
+    console.info('No commands were matched');
+}

dev-infra/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@angular/dev-infra-private",
+  "version": "0.0.0",
+  "description": "INTERNAL USE ONLY - Angular internal DevInfra tooling/scripts - INTERNAL USE ONLY",
+  "license": "MIT",
+  "private": true,
+  "bin": {
+    "ng-dev": "./bundle.js"
+  }
+}

dev-infra/pullapprove/BUILD.bazel

@@ -0,0 +1,19 @@
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
+
+ts_library(
+    name = "pullapprove",
+    srcs = [
+        "verify.ts",
+    ],
+    visibility = ["//dev-infra:__subpackages__"],
+    deps = [
+        "@npm//@types/minimatch",
+        "@npm//@types/node",
+        "@npm//@types/shelljs",
+        "@npm//@types/yaml",
+        "@npm//minimatch",
+        "@npm//shelljs",
+        "@npm//tslib",
+        "@npm//yaml",
+    ],
+)

dev-infra/pullapprove/verify.ts

@@ -0,0 +1,215 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {readFileSync} from 'fs';
+import {IMinimatch, Minimatch} from 'minimatch';
+import * as path from 'path';
+import {cd, exec, set} from 'shelljs';
+import {parse as parseYaml} from 'yaml';
+
+interface GlobMatcher {
+  group: string;
+  glob: string;
+  matcher: IMinimatch;
+  matchCount: number;
+}
+
+export function verify() {
+  // Exit early on shelljs errors
+  set('-e');
+
+  // Regex Matcher for contains_any_globs conditions
+  const CONTAINS_ANY_GLOBS_REGEX = /^'([^']+)',?$/;
+  // Full path of the angular project directory
+  const ANGULAR_PROJECT_DIR = process.cwd();
+  // Change to the Angular project directory
+  cd(ANGULAR_PROJECT_DIR);
+
+  // Whether to log verbosely
+  const VERBOSE_MODE = process.argv.includes('-v');
+  // Full path to PullApprove config file
+  const PULL_APPROVE_YAML_PATH = path.resolve(ANGULAR_PROJECT_DIR, '.pullapprove.yml');
+  // All relative path file names in the git repo, this is retrieved using git rather
+  // that a glob so that we only get files that are checked in, ignoring things like
+  // node_modules, .bazelrc.user, etc
+  const ALL_FILES = exec('git ls-tree --full-tree -r --name-only HEAD', {silent: true})
+                        .trim()
+                        .split('\n')
+                        .filter((_: string) => !!_);
+  if (!ALL_FILES.length) {
+    console.error(
+        `No files were found to be in the git tree, did you run this command from \n` +
+        `inside the angular repository?`);
+    process.exit(1);
+  }
+
+  /** Gets the glob matching information from each group's condition. */
+  function getGlobMatchersFromCondition(
+      groupName: string, condition: string): [GlobMatcher[], string[]] {
+    const trimmedCondition = condition.trim();
+    const globMatchers: GlobMatcher[] = [];
+    const badConditionLines: string[] = [];
+
+    // If the condition starts with contains_any_globs, evaluate all of the globs
+    if (trimmedCondition.startsWith('contains_any_globs')) {
+      trimmedCondition.split('\n')
+          .slice(1, -1)
+          .map(glob => {
+            const trimmedGlob = glob.trim();
+            const match = trimmedGlob.match(CONTAINS_ANY_GLOBS_REGEX);
+            if (!match) {
+              badConditionLines.push(trimmedGlob);
+              return '';
+            }
+            return match[1];
+          })
+          .filter(globString => !!globString)
+          .forEach(globString => globMatchers.push({
+            group: groupName,
+            glob: globString,
+            matcher: new Minimatch(globString, {dot: true}),
+            matchCount: 0,
+          }));
+    }
+    return [globMatchers, badConditionLines];
+  }
+
+  /** Create logs for each review group. */
+  function logGroups(groups: Map<string, Map<string, GlobMatcher>>) {
+    Array.from(groups.entries()).sort().forEach(([groupName, globs]) => {
+      console.groupCollapsed(groupName);
+      Array.from(globs.values())
+          .sort((a, b) => b.matchCount - a.matchCount)
+          .forEach(glob => console.info(`${glob.glob} - ${glob.matchCount}`));
+      console.groupEnd();
+    });
+  }
+
+  /** Logs a header within a text drawn box. */
+  function logHeader(...params: string[]) {
+    const totalWidth = 80;
+    const fillWidth = totalWidth - 2;
+    const headerText = params.join(' ').substr(0, fillWidth);
+    const leftSpace = Math.ceil((fillWidth - headerText.length) / 2);
+    const rightSpace = fillWidth - leftSpace - headerText.length;
+    const fill = (count: number, content: string) => content.repeat(count);
+
+    console.info(`┌${fill(fillWidth, '─')}┐`);
+    console.info(`│${fill(leftSpace, ' ')}${headerText}${fill(rightSpace, ' ')}│`);
+    console.info(`└${fill(fillWidth, '─')}┘`);
+  }
+
+  /** Runs the pull approve verification check on provided files. */
+  function runVerification(files: string[]) {
+    // All of the globs created for each group's conditions.
+    const allGlobs: GlobMatcher[] = [];
+    // The pull approve config file.
+    const pullApprove = readFileSync(PULL_APPROVE_YAML_PATH, {encoding: 'utf8'});
+    // All of the PullApprove groups, parsed from the PullApprove yaml file.
+    const parsedPullApproveGroups =
+        parseYaml(pullApprove).groups as{[key: string]: {conditions: string}};
+    // All files which were found to match a condition in PullApprove.
+    const matchedFiles = new Set<string>();
+    // All files which were not found to match a condition in PullApprove.
+    const unmatchedFiles = new Set<string>();
+    // All PullApprove groups which matched at least one file.
+    const matchedGroups = new Map<string, Map<string, GlobMatcher>>();
+    // All PullApprove groups which did not match at least one file.
+    const unmatchedGroups = new Map<string, Map<string, GlobMatcher>>();
+    // All condition lines which were not able to be correctly parsed, by group.
+    const badConditionLinesByGroup = new Map<string, string[]>();
+    // Total number of condition lines which were not able to be correctly parsed.
+    let badConditionLineCount = 0;
+
+    // Get all of the globs from the PullApprove group conditions.
+    Object.entries(parsedPullApproveGroups).forEach(([groupName, group]) => {
+      for (const condition of group.conditions) {
+        const [matchers, badConditions] = getGlobMatchersFromCondition(groupName, condition);
+        if (badConditions.length) {
+          badConditionLinesByGroup.set(groupName, badConditions);
+          badConditionLineCount += badConditions.length;
+        }
+        allGlobs.push(...matchers);
+      }
+    });
+
+    if (badConditionLineCount) {
+      console.info(`Discovered ${badConditionLineCount} parsing errors in PullApprove conditions`);
+      console.info(`Attempted parsing using: ${CONTAINS_ANY_GLOBS_REGEX}`);
+      console.info();
+      console.info(`Unable to properly parse the following line(s) by group:`);
+      badConditionLinesByGroup.forEach((badConditionLines, groupName) => {
+        console.info(`- ${groupName}:`);
+        badConditionLines.forEach(line => console.info(`    ${line}`));
+      });
+      console.info();
+      console.info(
+          `Please correct the invalid conditions, before PullApprove verification can be completed`);
+      process.exit(1);
+    }
+
+    // Check each file for if it is matched by a PullApprove condition.
+    for (let file of files) {
+      const matched = allGlobs.filter(glob => glob.matcher.match(file));
+      matched.length ? matchedFiles.add(file) : unmatchedFiles.add(file);
+      matched.forEach(glob => glob.matchCount++);
+    }
+
+    // Add each glob for each group to a map either matched or unmatched.
+    allGlobs.forEach(glob => {
+      const groups = glob.matchCount ? matchedGroups : unmatchedGroups;
+      const globs = groups.get(glob.group) || new Map<string, GlobMatcher>();
+      // Set the globs map in the groups map
+      groups.set(glob.group, globs);
+      // Set the glob in the globs map
+      globs.set(glob.glob, glob);
+    });
+
+    // PullApprove is considered verified if no files or groups are found to be unsed.
+    const verificationSucceeded = !(unmatchedFiles.size || unmatchedGroups.size);
+
+    /**
+     * Overall result
+     */
+    logHeader('Result');
+    if (verificationSucceeded) {
+      console.info('PullApprove verification succeeded!');
+    } else {
+      console.info(`PullApprove verification failed.\n`);
+      console.info(`Please update '.pullapprove.yml' to ensure that all necessary`);
+      console.info(`files/directories have owners and all patterns that appear in`);
+      console.info(`the file correspond to actual files/directories in the repo.`);
+    }
+    /**
+     * File by file Summary
+     */
+    logHeader('PullApprove file match results');
+    console.groupCollapsed(`Matched Files (${matchedFiles.size} files)`);
+    VERBOSE_MODE && matchedFiles.forEach(file => console.info(file));
+    console.groupEnd();
+    console.groupCollapsed(`Unmatched Files (${unmatchedFiles.size} files)`);
+    unmatchedFiles.forEach(file => console.info(file));
+    console.groupEnd();
+
+    /**
+     * Group by group Summary
+     */
+    logHeader('PullApprove group matches');
+    console.groupCollapsed(`Matched Groups (${matchedGroups.size} groups)`);
+    VERBOSE_MODE && logGroups(matchedGroups);
+    console.groupEnd();
+    console.groupCollapsed(`Unmatched Groups (${unmatchedGroups.size} groups)`);
+    logGroups(unmatchedGroups);
+    console.groupEnd();
+
+    // Provide correct exit code based on verification success.
+    process.exit(verificationSucceeded ? 0 : 1);
+  }
+
+
+  runVerification(ALL_FILES);
+}

dev-infra/rollup.config.js

@@ -0,0 +1,16 @@
+const node = require('rollup-plugin-node-resolve');
+const commonjs = require('rollup-plugin-commonjs');
+
+module.exports = {
+  external: ['shelljs', 'minimatch', 'yaml'],
+  preferBuiltins: true,
+  output: {
+    banner: "#!/usr/bin/env node",
+  },
+  plugins: [
+    node({
+      mainFields: ['browser', 'es2015', 'module', 'jsnext:main', 'main'],
+    }),
+    commonjs(),
+  ],
+};

docs/DEBUG_COMPONENTS_REPO_IVY.md

@@ -4,7 +4,7 @@ Currently all changes to Ivy are validated against the test suite of the
 `angular/components` repository. In order to debug the `components-repo-unit-tests` CI
 job, the following steps can be used:
 
-1\) Build the Ivy package output by running `node ./scripts/build-ivy-npm-packages.js` in
+1\) Build the Ivy package output by running `node ./scripts/build/build-ivy-npm-packages.js` in
 the `angular/angular` repo.
 
 2\) Clone the `angular/components` repository if not done yet ([quick link to repo](https://github.com/angular/components)).

docs/DEVELOPER.md

@@ -69,7 +69,7 @@ yarn install
 To build Angular run:
 
 ```shell
-node ./scripts/build-packages-dist.js
+node ./scripts/build/build-packages-dist.js
 ```
 
 * Results are put in the `dist/packages-dist` folder.
@@ -129,7 +129,7 @@ where `$ANGULAR_PATH` is an environment variable of the absolute path of your An
 You can check that your code is properly formatted and adheres to coding style by running:
 
 ``` shell
-$ yarn gulp lint
+$ yarn lint
 ```
 
 ## Publishing Snapshot Builds
@@ -190,7 +190,7 @@ c. Some package managers (such as `pnpm` or `yarn pnp`) might not work correctly
 ### Publishing to GitHub repos
 You can also manually publish `*-builds` snapshots just like our CircleCI build does for upstream
 builds. Before being able to publish the packages, you need to build them locally by running the
-`./scripts/build-packages-dist.js` script.
+`./scripts/build/build-packages-dist.js` script.
 
 First time, you need to create the GitHub repositories:
 

docs/TRIAGE_AND_LABELS.md

@@ -21,6 +21,7 @@ The components have a clear piece of source code associated with it within the `
   browser-platforms are very intertwined, we will be treating them as one
 * `comp: ivy` - a subset of core representing the new Ivy renderer.
 * `comp: ngcc` - a subset of ivy representing the [Angular Compatibility Compiler](../packages/compiler-cli/ngcc/README.md)
+* `comp: ve` - a subset of `core & compiler` representing changes specific to ViewEngine (legacy compiler/renderer).
 * `comp: docs-infra` - the angular.io application and docs-related tooling
 * `comp: elements`
 * `comp: forms`

gulpfile.js

@@ -45,11 +45,9 @@ gulp.task('format:changed', ['format:untracked', 'format:diff']);
 // Alias for `format:changed` that formerly formatted all files.
 gulp.task('format', ['format:changed']);
 
-gulp.task('lint', ['format:enforce', 'validate-commit-messages', 'tslint']);
+gulp.task('lint', ['format:enforce', 'validate-commit-messages']);
-gulp.task('tslint', ['tools:build'], loadTask('lint'));
 gulp.task('validate-commit-messages', loadTask('validate-commit-message'));
 gulp.task('source-map-test', loadTask('source-map-test'));
-gulp.task('tools:build', loadTask('tools-build'));
 gulp.task('changelog', loadTask('changelog'));
 gulp.task('changelog:zonejs', loadTask('changelog-zonejs'));
 gulp.task('check-env', () => {/* this is a noop because the env test ran already above */});

integration/README.md

@@ -4,7 +4,7 @@ This directory contains end-to-end tests for Angular. Each directory is a self-c
 that exactly mimics how a user might expect Angular to work, so they allow high-fidelity
 reproductions of real-world issues.
 
-For this to work, we first build the Angular distribution via `./scripts/build-packages-dist.js`, then
+For this to work, we first build the Angular distribution via `./scripts/build/build-packages-dist.js`, then
 install the distribution into each app.
 
 To test Angular CLI applications, we use the `cli-hello-world-*` integration tests.

integration/_payload-limits.json

@@ -60,7 +60,7 @@
       "uncompressed": {
         "bundle": "TODO(i): temporarily increase the payload size limit from 105779 - this is due to a closure issue related to ESM reexports that still needs to be investigated",
         "bundle": "TODO(i): we should define ngDevMode to false in Closure, but --define only works in the global scope.",
-        "bundle": 175498
+        "bundle": 170618
       }
     }
   }

integration/bazel-schematics/package.json

@@ -19,6 +19,7 @@
     "@angular/router": "file:../../node_modules/@angular/router",
     "@bazel/bazel": "file:../../node_modules/@bazel/bazel",
     "@types/node": "file:../../node_modules/@types/node",
+    "patch-package": "^6.2.1",
     "protractor": "file:../../node_modules/protractor",
     "puppeteer": "file:../../node_modules/puppeteer",
     "typescript": "file:../../node_modules/typescript",
@@ -29,6 +30,7 @@
     "**/webdriver-manager": "file:../../node_modules/webdriver-manager"
   },
   "scripts": {
-    "test": "./test.sh"
+    "test": "./test.sh",
+    "postinstall": "patch-package"
   }
 }

integration/bazel-schematics/patches/@angular+bazel+0.0.0.patch

@@ -0,0 +1,25 @@
+diff --git a/node_modules/@angular/bazel/src/builders/files/WORKSPACE.template b/node_modules/@angular/bazel/src/builders/files/WORKSPACE.template
+index 9aad043..e767dc6 100755
+--- a/node_modules/@angular/bazel/src/builders/files/WORKSPACE.template
++++ b/node_modules/@angular/bazel/src/builders/files/WORKSPACE.template
+@@ -10,7 +10,7 @@
+ # imports also make sense when referencing the published package.
+ workspace(
+     name = "project",
+-    managed_directories = {"@npm": ["node_modules"]},
++    # managed_directories = {"@npm": ["node_modules"]},
+ )
+ 
+ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+@@ -67,6 +67,11 @@ node_repositories(
+ yarn_install(
+     name = "npm",
+     package_json = "//:package.json",
++    # Turn off symlink_node_modules here as it causes flakiness with missing
++    # files in node_modules.
++    # TODO: track down the root cause of the flakiness; current suspect is that
++    # it is an issue with managed_directories when resources are limited
++    symlink_node_modules = False,
+     yarn_lock = "//:yarn.lock",
+ )
+ 

integration/bazel-schematics/test.sh

@@ -38,7 +38,7 @@ function installLocalPackages() {
   local_packages+=("puppeteer@file:${pwd}/../node_modules/puppeteer")
   local_packages+=("webdriver-manager@file:${pwd}/../node_modules/webdriver-manager")
 
-  yarn add --ignore-scripts --silent "${local_packages[@]}"
+  yarn add --ignore-scripts --silent "${local_packages[@]}" --cache-folder ./.yarn_local_cache
 }
 
 function patchKarmaConf() {
@@ -58,6 +58,8 @@ function testBazel() {
   # Create project
   ng new demo --collection=@angular/bazel --routing --skip-git --skip-install --style=scss
   cd demo
+  # Use a local yarn cache folder so we don't access the global yarn cache
+  mkdir .yarn_local_cache
   patchKarmaConf
   patchProtractorConf
   installLocalPackages
@@ -79,7 +81,7 @@ function testNonBazel() {
   # disable CLI's version check (if version is 0.0.0, then no version check happens)
   yarn --cwd node_modules/@angular/cli version --new-version 0.0.0 --no-git-tag-version
   # re-add build-angular
-  yarn add --dev file:../node_modules/@angular-devkit/build-angular
+  yarn add --dev file:../node_modules/@angular-devkit/build-angular --cache-folder ./.yarn_local_cache
   ng build --progress=false
   ng test --progress=false --watch=false
   ng e2e --port 0 --configuration=production --webdriver-update=false

integration/bazel-schematics/yarn.lock

@@ -2,26 +2,26 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/architect@0.900.0-rc.14":
+"@angular-devkit/architect@0.900.3":
-  version "0.900.0-rc.14"
+  version "0.900.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.900.0-rc.14.tgz#cfdbee7899b9addfd9d43c638b0dbc21188f0a79"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.900.3.tgz#9c396733abd12fbb1d5bbc4542b2ee52418adb02"
-  integrity sha512-dgEc/zYE0uzv+m8JTdv3FDc7bViJKbxs8FY3zdkArc6MXIXpoMzgvveEEHvhrpO0iu6njW/xRSZYtYnTIY4xlw==
+  integrity sha512-4UHc58Dlc5XHY3eiYSX9gytLyPNYixGSRwLcc/LRwuPgrmUFKPzCN3nwgB+9kc03/HN89CsJ1rS1scid6N6vxQ==
   dependencies:
-    "@angular-devkit/core" "9.0.0-rc.14"
+    "@angular-devkit/core" "9.0.3"
     rxjs "6.5.3"
 
-"@angular-devkit/build-angular@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/angular-devkit_build-angular_archive.tar.gz":
+"@angular-devkit/build-angular@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/angular-devkit_build-angular_archive.tar.gz":
-  version "0.900.0-rc.14"
+  version "0.900.3"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/angular-devkit_build-angular_archive.tar.gz#b50ff9c17fafb2539c951ea4f3ad1e15ca15b67d"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/angular-devkit_build-angular_archive.tar.gz#41069993f7a6f44dca0a7707f0c3b5ce0ec253d1"
   dependencies:
-    "@angular-devkit/architect" "0.900.0-rc.14"
+    "@angular-devkit/architect" "0.900.3"
-    "@angular-devkit/build-optimizer" "0.900.0-rc.14"
+    "@angular-devkit/build-optimizer" "0.900.3"
-    "@angular-devkit/build-webpack" "0.900.0-rc.14"
+    "@angular-devkit/build-webpack" "0.900.3"
-    "@angular-devkit/core" "9.0.0-rc.14"
+    "@angular-devkit/core" "9.0.3"
     "@babel/core" "7.7.7"
     "@babel/generator" "7.7.7"
     "@babel/preset-env" "7.7.7"
-    "@ngtools/webpack" "9.0.0-rc.14"
+    "@ngtools/webpack" "9.0.3"
     ajv "6.10.2"
     autoprefixer "9.7.1"
     babel-loader "8.0.6"
@@ -76,10 +76,10 @@
     webpack-subresource-integrity "1.3.4"
     worker-plugin "3.2.0"
 
-"@angular-devkit/build-optimizer@0.900.0-rc.14":
+"@angular-devkit/build-optimizer@0.900.3":
-  version "0.900.0-rc.14"
+  version "0.900.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.900.0-rc.14.tgz#e90e955e1daf5689ad198a5253134187c99b7b5a"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.900.3.tgz#91f90c56affb0be9f7910dfc1d414f16c21c2c3f"
-  integrity sha512-MA2g8N9/cvzMvudEEjeaNV6STwSr8NI/znpv+nU6sQa4PdegIotBbqxGUmHMKtLH5cOwDy9hI47ANN+XADbIbQ==
+  integrity sha512-VLAWtAXpOzOoYUJrN6sT90UdIdvrVIipkzGz7nfI1kscDvxUFwVZnsNNHtFinaY2SfZAunHhYQOA/B9FJ8WPdQ==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.7.3"
@@ -87,19 +87,19 @@
     typescript "3.6.4"
     webpack-sources "1.4.3"
 
-"@angular-devkit/build-webpack@0.900.0-rc.14":
+"@angular-devkit/build-webpack@0.900.3":
-  version "0.900.0-rc.14"
+  version "0.900.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.900.0-rc.14.tgz#b932148f14ed0056f1885c98c330411a80d31331"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.900.3.tgz#4a2fd13cebe190c091606e18397a1f7cccfab6bb"
-  integrity sha512-HvrDapIKr4k2a7Tf7MdW0miGOUUzHxRkGyDIWJBDXLbfOIt9BnhKfFGxP/SyDlwJnLyat9yYZjcDu1AI0E1Dmw==
+  integrity sha512-9gSTLWf7yq/XBOec0CtZcjNMsC7L8IuVDProBQHps2SvTfr982DtHfEge95J2lc9BjRbqidv+phImFsQ1J3mFA==
   dependencies:
-    "@angular-devkit/architect" "0.900.0-rc.14"
+    "@angular-devkit/architect" "0.900.3"
-    "@angular-devkit/core" "9.0.0-rc.14"
+    "@angular-devkit/core" "9.0.3"
     rxjs "6.5.3"
 
-"@angular-devkit/core@9.0.0-rc.14":
+"@angular-devkit/core@9.0.3":
-  version "9.0.0-rc.14"
+  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.0.0-rc.14.tgz#5cff058750c0b063a6f5fa1a2e830f1f48ffa56b"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-9.0.3.tgz#a027862d2edd981afcc6245176e9f27768c631c9"
-  integrity sha512-hFiKoAPtnOqqYv97Y22OgyeTFxjNU/6WDhmuXkfbZDKychvuBLDOdgUhL43heEzavSfCCl23E0JmilwCUcepmw==
+  integrity sha512-3+abmv9K9d+BVgUAolYgoOqlGAA2Jb1pWo2biapSDG6KjUZHUCJdnsKigLtLorCdv0SrjTp56FFplkcqKsFQgA==
   dependencies:
     ajv "6.10.2"
     fast-json-stable-stringify "2.0.0"
@@ -107,36 +107,36 @@
     rxjs "6.5.3"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@9.0.0-rc.14":
+"@angular-devkit/schematics@9.0.3":
-  version "9.0.0-rc.14"
+  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.0.0-rc.14.tgz#4605b1ee9f18b772094697f9b35258fdac76d4b3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-9.0.3.tgz#e65fa1ce08a3d5ef0af594b623024439c1110a0d"
-  integrity sha512-i/XTxo7hTXTFKus51Qry3rRGHL2uS4SgufGqdvOcy2qZbjyh/wt0UDOGJu/w8dcA9pJm+vFBLAbnro5oFyIsVw==
+  integrity sha512-BQnZtFQPLZZOijhuEndtzL6cOnhaE8nNxupkRHavWohOMStnLsRyvVJj6JVDkf37wvT5koqTNjHhbdMxcCRc6A==
   dependencies:
-    "@angular-devkit/core" "9.0.0-rc.14"
+    "@angular-devkit/core" "9.0.3"
     ora "4.0.2"
     rxjs "6.5.3"
 
-"@angular/animations@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/animations/npm_package_archive.tar.gz":
+"@angular/animations@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/animations/npm_package_archive.tar.gz":
   version "0.0.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/animations/npm_package_archive.tar.gz#3adb32242698999cb769934abccedd9f5c590036"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/animations/npm_package_archive.tar.gz#068a466222bb8cc3ad83f6621f81f5ba43dbc60c"
 
-"@angular/bazel@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/bazel/npm_package_archive.tar.gz":
+"@angular/bazel@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/bazel/npm_package_archive.tar.gz":
   version "0.0.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/bazel/npm_package_archive.tar.gz#06940dc70222aa4abb87ca6bac032a197a02d578"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/bazel/npm_package_archive.tar.gz#9a47371cd27ce5317c07b4386407d6cb60933b2b"
   dependencies:
     "@microsoft/api-extractor" "^7.3.9"
     shelljs "0.8.2"
     tsickle "^0.38.0"
 
-"@angular/cli@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/angular_cli_archive.tar.gz":
+"@angular/cli@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/angular_cli_archive.tar.gz":
-  version "9.0.0-rc.14"
+  version "9.0.3"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/angular_cli_archive.tar.gz#68c932f4ec0991ba979b45d4cbaf7eedc8973bb4"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/angular_cli_archive.tar.gz#8f18034bdddd079d3bab8a4de43fe1d9dcca4142"
   dependencies:
-    "@angular-devkit/architect" "0.900.0-rc.14"
+    "@angular-devkit/architect" "0.900.3"
-    "@angular-devkit/core" "9.0.0-rc.14"
+    "@angular-devkit/core" "9.0.3"
-    "@angular-devkit/schematics" "9.0.0-rc.14"
+    "@angular-devkit/schematics" "9.0.3"
-    "@schematics/angular" "9.0.0-rc.14"
+    "@schematics/angular" "9.0.3"
-    "@schematics/update" "0.900.0-rc.14"
+    "@schematics/update" "0.900.3"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.1"
     debug "^4.1.1"
@@ -153,13 +153,13 @@
     universal-analytics "^0.4.20"
     uuid "^3.3.2"
 
-"@angular/common@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/common/npm_package_archive.tar.gz":
+"@angular/common@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/common/npm_package_archive.tar.gz":
   version "0.0.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/common/npm_package_archive.tar.gz#b44ef9973f04db69decb9978824ba0d99afe9286"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/common/npm_package_archive.tar.gz#03477fd1f71901db1d9b75ae54edf68f0fe3bf28"
 
-"@angular/compiler-cli@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/compiler-cli/npm_package_archive.tar.gz":
+"@angular/compiler-cli@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/compiler-cli/npm_package_archive.tar.gz":
   version "0.0.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/compiler-cli/npm_package_archive.tar.gz#22a041574d15d4218d2f9d4d4bd1389ca8fbe101"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/compiler-cli/npm_package_archive.tar.gz#bb573836de2ba33feaae6b029063751acf3b7c42"
   dependencies:
     canonical-path "1.0.0"
     chokidar "^3.0.0"
@@ -171,35 +171,36 @@
     reflect-metadata "^0.1.2"
     semver "^6.3.0"
     source-map "^0.6.1"
+    sourcemap-codec "^1.4.8"
     yargs "13.1.0"
 
-"@angular/compiler@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/compiler/npm_package_archive.tar.gz":
+"@angular/compiler@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/compiler/npm_package_archive.tar.gz":
   version "0.0.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/compiler/npm_package_archive.tar.gz#8cb29b1656564a1105c8e806f5d6b3e1d8b17a2b"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/compiler/npm_package_archive.tar.gz#4b4f62c748b436e7b162e9d8ebac615de7292639"
 
-"@angular/core@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/core/npm_package_archive.tar.gz":
+"@angular/core@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/core/npm_package_archive.tar.gz":
   version "0.0.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/core/npm_package_archive.tar.gz#679c803ef3d63562c9389916c1d5174b3754199f"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/core/npm_package_archive.tar.gz#0b45c6408fc137a289213907bd96e01e4000f44d"
 
-"@angular/forms@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/forms/npm_package_archive.tar.gz":
+"@angular/forms@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/forms/npm_package_archive.tar.gz":
   version "0.0.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/forms/npm_package_archive.tar.gz#e46870871fc8aef7a57d022b90ad32f1fd64e7bf"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/forms/npm_package_archive.tar.gz#bec4d3fd05ca98084dc085f54c2578661355f02b"
 
-"@angular/language-service@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/language-service/npm_package_archive.tar.gz":
+"@angular/language-service@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/language-service/npm_package_archive.tar.gz":
   version "0.0.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/language-service/npm_package_archive.tar.gz#6e913e6aa7d921d5c30a1ac6ca9646a220887d5b"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/language-service/npm_package_archive.tar.gz#eb064eb2a69df356e5229bda3651eb90fca487d1"
 
-"@angular/platform-browser-dynamic@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/platform-browser-dynamic/npm_package_archive.tar.gz":
+"@angular/platform-browser-dynamic@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/platform-browser-dynamic/npm_package_archive.tar.gz":
   version "0.0.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/platform-browser-dynamic/npm_package_archive.tar.gz#db2804acfb8fc6fb2f3aa46e657e7c25d4d64314"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/platform-browser-dynamic/npm_package_archive.tar.gz#3401f6226262090d852df825c62928e4d915f130"
 
-"@angular/platform-browser@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/platform-browser/npm_package_archive.tar.gz":
+"@angular/platform-browser@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/platform-browser/npm_package_archive.tar.gz":
   version "0.0.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/platform-browser/npm_package_archive.tar.gz#3d71864b3accd9834e49e8098c48ee4a15bd015c"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/platform-browser/npm_package_archive.tar.gz#79f1e1c40976be097e6a43009e8c2c8cae690a0a"
 
-"@angular/router@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/router/npm_package_archive.tar.gz":
+"@angular/router@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/router/npm_package_archive.tar.gz":
   version "0.0.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/router/npm_package_archive.tar.gz#80aad793835f538439bb5c27e4db97d4113e6577"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/angular/packages/router/npm_package_archive.tar.gz#819fa19157bf44601adc4e4462e646ab8e168523"
 
 "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
   version "7.8.3"
@@ -896,9 +897,9 @@
   resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-2.1.0.tgz#013960fe506ddb8dc08f5d54b52420c818eb4264"
   integrity sha512-Y6cs3frmCqoAsrDmEp0msyS8VYE13JvjVoyvdIXTOh5Cc4fOeWzSPb02VS08asaV1jCnOQbv15Ud286hcxAvxg==
 
-"@bazel/bazel@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/bazel_bazel_archive.tar.gz":
+"@bazel/bazel@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/bazel_bazel_archive.tar.gz":
   version "2.1.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/bazel_bazel_archive.tar.gz#23536a5d4ce19c68eeaef484c79782a79fd41d84"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/bazel_bazel_archive.tar.gz#23536a5d4ce19c68eeaef484c79782a79fd41d84"
   dependencies:
     "@bazel/hide-bazel-files" latest
   optionalDependencies:
@@ -969,31 +970,31 @@
   resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.14.tgz#0e0810a0a174e50e22dfe8edb30599840712f22d"
   integrity sha512-518yewjSga1jLdiLrcmpMFlaba5P+50b0TWNFUpC+SL9Yzf0kMi57qw+bMl+rQ08cGqH1vLx4eg9YFUbZXgZ0Q==
 
-"@ngtools/webpack@9.0.0-rc.14":
+"@ngtools/webpack@9.0.3":
-  version "9.0.0-rc.14"
+  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-9.0.0-rc.14.tgz#6a764138347d2ff3846753a141eaacdab3b0658c"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-9.0.3.tgz#d05b5a15584909262a4db027919f03ccb074dc11"
-  integrity sha512-G98u14exE36kR4LflWB20ClJ6ql9B0qMcyokepjwpVAgaoDfpJRR7mKAZliMPd0KFXktdnct2QEyF6pbLevO7w==
+  integrity sha512-pMIXfq1IJLbvwmkPonGs7nrpuBCXrlZTf9A4OYsMBZcfU8JMn0pRdx7G2+bC9Q/f+uSw2uvPSv76xJXLBOntmA==
   dependencies:
-    "@angular-devkit/core" "9.0.0-rc.14"
+    "@angular-devkit/core" "9.0.3"
     enhanced-resolve "4.1.1"
     rxjs "6.5.3"
     webpack-sources "1.4.3"
 
-"@schematics/angular@9.0.0-rc.14":
+"@schematics/angular@9.0.3":
-  version "9.0.0-rc.14"
+  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.0.0-rc.14.tgz#4112aeb6c76144893d65cab9f53ca8422adc3bbb"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-9.0.3.tgz#8b0fb91fa18dd909001ac0d888479a96810aa640"
-  integrity sha512-NWxDLym2Sst5lTvV7QYkVUjy3N0CfCohhdWC4DGRtjUyTD2eUepAg1PZCQcq8U2iRtd78Lm1n4obDWO1tW3pXQ==
+  integrity sha512-6XSnPW4G7aoKXccg0FTpZ02y/yi9y/bj7swnSL9Z4RRPIvPVapDjB7uJPg8sm8+PTIpcMhEFQrchIqM3LXW4zA==
   dependencies:
-    "@angular-devkit/core" "9.0.0-rc.14"
+    "@angular-devkit/core" "9.0.3"
-    "@angular-devkit/schematics" "9.0.0-rc.14"
+    "@angular-devkit/schematics" "9.0.3"
 
-"@schematics/update@0.900.0-rc.14":
+"@schematics/update@0.900.3":
-  version "0.900.0-rc.14"
+  version "0.900.3"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.900.0-rc.14.tgz#1debea3eb90559d25838e7b256b48bac216e19d9"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.900.3.tgz#9141ee2e1b6356e66f6269b92c284c86e4faf065"
-  integrity sha512-ZlsneHwpvrtpt0D10g4S8JftLaSFQtSO+kOD1uP26OxNMg9w54jrlr7xWSwAmT69/ETjNy8BFKXdcU9yvYixPA==
+  integrity sha512-mlRsm3/HM1f/10Wdz4xMYA+mpW3EDCB+whlV5cJ7PGMhjUMaxA9DuWvoP06h05le6XmgnjIEoxL6NJ7CgesHcA==
   dependencies:
-    "@angular-devkit/core" "9.0.0-rc.14"
+    "@angular-devkit/core" "9.0.3"
-    "@angular-devkit/schematics" "9.0.0-rc.14"
+    "@angular-devkit/schematics" "9.0.3"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     npm-package-arg "^7.0.0"
@@ -1058,9 +1059,9 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.8.tgz#92509422653f10e9c0ac18d87e0610b39f9821c7"
   integrity sha512-8KmlRxwbKZfjUHFIt3q8TF5S2B+/E5BaAoo/3mgc5h6FJzqxXkCK/VMetO+IRDtwtU6HUvovHMBn+XRj7SV9Qg==
 
-"@types/node@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/types_node_archive.tar.gz":
+"@types/node@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/types_node_archive.tar.gz":
   version "12.11.1"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/types_node_archive.tar.gz#5e661926d854590d3e9cec111d80feafdaf4ee78"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/types_node_archive.tar.gz#5e661926d854590d3e9cec111d80feafdaf4ee78"
 
 "@types/q@^0.0.32":
   version "0.0.32"
@@ -1252,7 +1253,7 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-"@yarnpkg/lockfile@1.1.0":
+"@yarnpkg/lockfile@1.1.0", "@yarnpkg/lockfile@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
@@ -2056,6 +2057,11 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -2400,7 +2406,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-spawn@^6.0.0:
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -3327,6 +3333,14 @@ find-up@^4.0.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-yarn-workspace-root@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
+  integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==
+  dependencies:
+    fs-extra "^4.0.3"
+    micromatch "^3.1.4"
+
 flush-write-stream@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
@@ -3395,7 +3409,16 @@ fs-extra@4.0.2:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@~7.0.1:
+fs-extra@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^7.0.1, fs-extra@~7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
   integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
@@ -4123,6 +4146,13 @@ is-callable@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+  dependencies:
+    ci-info "^2.0.0"
+
 is-color-stop@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
@@ -4585,6 +4615,13 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+klaw-sync@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
+  integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
@@ -5639,6 +5676,24 @@ pascalcase@^0.1.1:
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
+patch-package@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.2.1.tgz#e3c55cf09dffd3984dd300e30d842672b604307f"
+  integrity sha512-dfCtQor63PPij6DDYtCzBRoO5nNAcMSg7Cmh+DLhR+s3t0OLQBdvFxJksZHBe1J2MjsSWDjTF4+oQKFbdkssIg==
+  dependencies:
+    "@yarnpkg/lockfile" "^1.1.0"
+    chalk "^2.4.2"
+    cross-spawn "^6.0.5"
+    find-yarn-workspace-root "^1.2.1"
+    fs-extra "^7.0.1"
+    is-ci "^2.0.0"
+    klaw-sync "^6.0.0"
+    minimist "^1.2.0"
+    rimraf "^2.6.3"
+    semver "^5.6.0"
+    slash "^2.0.0"
+    tmp "^0.0.33"
+
 path-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
@@ -6146,9 +6201,9 @@ protoduck@^5.0.1:
   dependencies:
     genfun "^5.0.0"
 
-"protractor@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/protractor_archive.tar.gz":
+"protractor@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/protractor_archive.tar.gz":
   version "5.4.3"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/protractor_archive.tar.gz#6dcc8c321fcde8864b4919f8e053be8ab94812b0"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/protractor_archive.tar.gz#6dcc8c321fcde8864b4919f8e053be8ab94812b0"
   dependencies:
     "@types/q" "^0.0.32"
     "@types/selenium-webdriver" "^3.0.0"
@@ -6246,9 +6301,9 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-"puppeteer@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/puppeteer_archive.tar.gz":
+"puppeteer@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/puppeteer_archive.tar.gz":
   version "2.1.1"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/puppeteer_archive.tar.gz#a34ddad83471c2b071467027c05f9aa635429431"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/puppeteer_archive.tar.gz#a34ddad83471c2b071467027c05f9aa635429431"
   dependencies:
     "@types/mime-types" "^2.1.0"
     debug "^4.1.0"
@@ -6984,6 +7039,11 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
 smart-buffer@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
@@ -7126,6 +7186,11 @@ sourcemap-codec@^1.4.4:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
   integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
 
+sourcemap-codec@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
 spdx-correct@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -7669,9 +7734,9 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
-"tslib@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/tslib_archive.tar.gz":
+"tslib@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/tslib_archive.tar.gz":
   version "1.10.0"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/tslib_archive.tar.gz#8c9c2d89e039129330357b42a44c1d98ac5b029e"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/tslib_archive.tar.gz#8c9c2d89e039129330357b42a44c1d98ac5b029e"
 
 tty-browserify@0.0.0:
   version "0.0.0"
@@ -7713,9 +7778,9 @@ typescript@3.6.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.4.tgz#b18752bb3792bc1a0281335f7f6ebf1bbfc5b91d"
   integrity sha512-unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg==
 
-"typescript@file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/typescript_archive.tar.gz":
+"typescript@file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/typescript_archive.tar.gz":
   version "3.7.4"
-  resolved "file:../../../../../../private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/typescript_archive.tar.gz#6463332bce549a063d07063c0fe09416d4732f67"
+  resolved "file:../../../../../../private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/typescript_archive.tar.gz#6463332bce549a063d07063c0fe09416d4732f67"
 
 typescript@~3.5.3:
   version "3.5.3"
@@ -7975,9 +8040,9 @@ webdriver-js-extender@2.1.0:
     "@types/selenium-webdriver" "^3.0.0"
     selenium-webdriver "^3.0.1"
 
-webdriver-manager@^12.0.6, "webdriver-manager@file:/private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/webdriver-manager_archive.tar.gz":
+webdriver-manager@^12.0.6, "webdriver-manager@file:/private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/webdriver-manager_archive.tar.gz":
   version "12.1.7"
-  resolved "file:/private/var/tmp/_bazel_greg/5e8f8a9cd1c6fbc1afd11e37ee1fe2e5/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/webdriver-manager_archive.tar.gz#1de5c677e825cd6964bf398686af67120305b17e"
+  resolved "file:/private/var/tmp/_bazel_greg/0fd61ed550651b87aabc580a0eb4c09f/execroot/angular/bazel-out/darwin-fastbuild/bin/integration/bazel-schematics_test.debug.sh.runfiles/npm/webdriver-manager_archive.tar.gz#f1a1a624b461810bab9993e9822f9726fe46c877"
   dependencies:
     adm-zip "^0.4.9"
     chalk "^1.1.1"

integration/bazel/WORKSPACE

@@ -1,7 +1,4 @@
-workspace(
+workspace(name = "bazel_integration_test")
-    name = "bazel_integration_test",
-    managed_directories = {"@npm": ["node_modules"]},
-)
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
@@ -57,6 +54,11 @@ node_repositories(
 yarn_install(
     name = "npm",
     package_json = "//:package.json",
+    # Turn off symlink_node_modules here as it causes flakiness with missing
+    # files in node_modules.
+    # TODO: track down the root cause of the flakiness; current suspect is that
+    # it is an issue with managed_directories when resources are limited
+    symlink_node_modules = False,
     yarn_lock = "//:yarn.lock",
 )
 

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

@@ -11,7 +11,7 @@ set -u -e -o pipefail
 
 cd "$(dirname "$0")"
 
-node $(pwd)/../../scripts/build-packages-dist.js
+node $(pwd)/../../scripts/build/build-packages-dist.js
 
 # Workaround https://github.com/yarnpkg/yarn/issues/2165
 # Yarn will cache file://dist URIs and not update Angular code

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

@@ -11,7 +11,7 @@ set -u -e -o pipefail
 
 cd "$(dirname "$0")"
 
-node $(pwd)/../../scripts/build-packages-dist.js
+node $(pwd)/../../scripts/build/build-packages-dist.js
 
 # Workaround https://github.com/yarnpkg/yarn/issues/2165
 # Yarn will cache file://dist URIs and not update Angular code

integration/ivy-i18n/debug-test.sh

@@ -11,7 +11,7 @@ set -u -e -o pipefail
 
 cd "$(dirname "$0")"
 
-node $(pwd)/../../scripts/build-packages-dist.js
+node $(pwd)/../../scripts/build/build-packages-dist.js
 
 # Workaround https://github.com/yarnpkg/yarn/issues/2165
 # Yarn will cache file://dist URIs and not update Angular code

integration/language_service_plugin/package.json

@@ -13,7 +13,7 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "build-dist": "node ../../scripts/build-packages-dist.js && yarn install --check-files",
+    "build-dist": "node ../../scripts/build/build-packages-dist.js && yarn install --check-files",
     "cleanup": "rm -rf ti-*.log tsserver.log",
     "golden": "yarn build && node generate.js",
     "test": "yarn cleanup && yarn build && jasmine test.js"

integration/ng_elements_schematics/package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "build-dist": "node ../../scripts/build-packages-dist.js && yarn install --check-files",
+    "build-dist": "node ../../scripts/build/build-packages-dist.js && yarn install --check-files",
     "test": "yarn build && node test.js"
   }
 }

integration/ng_elements_schematics/test.ts

@@ -53,11 +53,13 @@ rm('-rf', `demo`);
 exec('ng version');
 exec('ng new demo --skip-git --skip-install --style=css --no-interactive');
 cd('demo');
+// Use a local yarn cache folder so we don't access the global yarn cache
+exec('mkdir .yarn_local_cache');
 
 // Install Angular packages that are built locally from HEAD and npm packages
 // from root node modules that are to be kept in sync
 const packageList = Object.keys(packages).map(p => `${p}@${packages[p]}`).join(' ');
-exec(`yarn add --ignore-scripts --silent ${packageList}`);
+exec(`yarn add --ignore-scripts --silent ${packageList} --cache-folder ./.yarn_local_cache`);
 
 // Add @angular/elements
 exec(bazelMappings ? `ng add "${bazelMappings['@angular/elements']}"` : `ng add "${__dirname}/../../dist/packages-dist/elements"`);

integration/ngcc/debug-test.sh

@@ -11,7 +11,7 @@ set -u -e -o pipefail
 
 cd "$(dirname "$0")"
 
-node $(pwd)/../../scripts/build-packages-dist.js
+node $(pwd)/../../scripts/build/build-packages-dist.js
 
 # Workaround https://github.com/yarnpkg/yarn/issues/2165
 # Yarn will cache file://dist URIs and not update Angular code

integration/run_tests.sh

@@ -34,7 +34,7 @@ if $CI; then
 else
   # Not on CircleCI so let's build the packages-dist directory.
   # This should be fast on incremental re-build.
-  node ${basedir}/scripts/build-packages-dist.js
+  node ${basedir}/scripts/build/build-packages-dist.js
 
   # If we aren't running on CircleCI, we do not shard tests because this would be the job of
   # Bazel eventually. For now, we just run all tests sequentially when running locally.

modules/benchmarks_external/README.md

@@ -1,6 +0,0 @@
-# How to run the benchmarks_external locally
-
-$ cp -r ./modules/benchmarks_external ./dist/all/
-$ ./node_modules/.bin/tsc -p modules --emitDecoratorMetadata -w
-$ gulp serve
-$ open http://localhost:8000/all/benchmarks_external/src/tree/index.html?bundles=false

modules/benchmarks_external/e2e_test/compiler_perf.ts

@@ -1,37 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {runClickBenchmark, verifyNoBrowserErrors} from '@angular/testing/src/perf_util';
-
-describe('ng1.x compiler benchmark', function() {
-
-  const URL = 'benchmarks_external/src/compiler/compiler_benchmark.html';
-
-  afterEach(verifyNoBrowserErrors);
-
-  it('should log withBinding stats', function(done) {
-    runClickBenchmark({
-      url: URL,
-      buttons: ['#compileWithBindings'],
-      id: 'ng1.compile.withBindings',
-      params: [{name: 'elements', value: 150, scale: 'linear'}],
-      waitForAngular2: false
-    }).then(done, done.fail);
-  });
-
-  it('should log noBindings stats', function(done) {
-    runClickBenchmark({
-      url: URL,
-      buttons: ['#compileNoBindings'],
-      id: 'ng1.compile.noBindings',
-      params: [{name: 'elements', value: 150, scale: 'linear'}],
-      waitForAngular2: false
-    }).then(done, done.fail);
-  });
-
-});

modules/benchmarks_external/e2e_test/largetable_perf.ts

@@ -1,33 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {runClickBenchmark, verifyNoBrowserErrors} from '@angular/testing/src/perf_util';
-
-describe('ng1.x largetable benchmark', function() {
-  const URL = 'benchmarks_external/src/largetable/largetable_benchmark.html';
-
-  afterEach(verifyNoBrowserErrors);
-
-  ['baselineBinding', 'baselineInterpolation', 'ngBind', 'ngBindOnce', 'interpolation',
-   'interpolationAttr', 'ngBindFn', 'interpolationFn', 'ngBindFilter', 'interpolationFilter']
-      .forEach(function(benchmarkType) {
-        it('should log the stats with: ' + benchmarkType, function(done) {
-          runClickBenchmark({
-            url: URL,
-            buttons: ['#destroyDom', '#createDom'],
-            id: 'ng1.largetable.' + benchmarkType,
-            params: [
-              {name: 'columns', value: 100, scale: 'sqrt'},
-              {name: 'rows', value: 20, scale: 'sqrt'},
-              {name: 'benchmarkType', value: benchmarkType}
-            ],
-            waitForAngular2: false
-          }).then(done, done.fail);
-        });
-      });
-});

modules/benchmarks_external/e2e_test/naive_infinite_scroll_perf.ts

@@ -1,41 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {runBenchmark, verifyNoBrowserErrors} from '@angular/testing/src/perf_util';
-
-describe('ng-dart1.x naive infinite scroll benchmark', function() {
-
-  const URL = 'benchmarks_external/src/naive_infinite_scroll/index.html';
-
-  afterEach(verifyNoBrowserErrors);
-
-  [1, 2, 4].forEach(function(appSize) {
-    it('should run scroll benchmark and collect stats for appSize = ' + appSize, function(done) {
-      runBenchmark({
-        url: URL,
-        id: 'ng1-dart1.x.naive_infinite_scroll',
-        work: function() {
-          $('#reset-btn').click();
-          $('#run-btn').click();
-          let s = 1000;
-          if (appSize > 4) {
-            s = s + appSize * 100;
-          }
-          browser.sleep(s);
-        },
-        params: [
-          {name: 'appSize', value: appSize},
-          {name: 'iterationCount', value: 20, scale: 'linear'},
-          {name: 'scrollIncrement', value: 40}
-        ],
-        waitForAngular2: false
-      }).then(done, done.fail);
-    });
-  });
-
-});

modules/benchmarks_external/e2e_test/react_tree_perf.ts

@@ -1,37 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {runClickBenchmark, verifyNoBrowserErrors} from '@angular/testing/src/perf_util';
-
-describe('react tree benchmark', function() {
-
-  const URL = 'benchmarks_external/src/tree/react/index.html';
-
-  afterEach(verifyNoBrowserErrors);
-
-  it('should log the stats (create)', function(done) {
-    runClickBenchmark({
-      url: URL,
-      buttons: ['#destroyDom', '#createDom'],
-      id: 'react.tree.create',
-      params: [{name: 'depth', value: 9, scale: 'log2'}],
-      waitForAngular2: false
-    }).then(done, done.fail);
-  });
-
-  it('should log the stats (update)', function(done) {
-    runClickBenchmark({
-      url: URL,
-      buttons: ['#createDom'],
-      id: 'react.tree.update',
-      params: [{name: 'depth', value: 9, scale: 'log2'}],
-      waitForAngular2: false
-    }).then(done, done.fail);
-  });
-
-});

modules/benchmarks_external/e2e_test/static_tree_perf.ts

@@ -1,37 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {runClickBenchmark, verifyNoBrowserErrors} from '@angular/testing/src/perf_util';
-
-describe('ng1.x tree benchmark', function() {
-
-  const URL = 'benchmarks_external/src/static_tree/tree_benchmark.html';
-
-  afterEach(verifyNoBrowserErrors);
-
-  it('should log the stats (create)', function(done) {
-    runClickBenchmark({
-      url: URL,
-      buttons: ['#destroyDom', '#createDom'],
-      id: 'ng1.static.tree.create',
-      params: [],
-      waitForAngular2: false
-    }).then(done, done.fail);
-  });
-
-  it('should log the stats (update)', function(done) {
-    runClickBenchmark({
-      url: URL,
-      buttons: ['#createDom'],
-      id: 'ng1.static.tree.update',
-      params: [],
-      waitForAngular2: false
-    }).then(done, done.fail);
-  });
-
-});

modules/benchmarks_external/e2e_test/tree_perf.ts

@@ -1,37 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {runClickBenchmark, verifyNoBrowserErrors} from '@angular/testing/src/perf_util';
-
-describe('ng1.x tree benchmark', function() {
-
-  const URL = 'benchmarks_external/src/tree/tree_benchmark.html';
-
-  afterEach(verifyNoBrowserErrors);
-
-  it('should log the stats (create)', function(done) {
-    runClickBenchmark({
-      url: URL,
-      buttons: ['#destroyDom', '#createDom'],
-      id: 'ng1.tree.create',
-      params: [{name: 'depth', value: 9, scale: 'log2'}],
-      waitForAngular2: false
-    }).then(done, done.fail);
-  });
-
-  it('should log the stats (update)', function(done) {
-    runClickBenchmark({
-      url: URL,
-      buttons: ['#createDom'],
-      id: 'ng1.tree.update',
-      params: [{name: 'depth', value: 9, scale: 'log2'}],
-      waitForAngular2: false
-    }).then(done, done.fail);
-  });
-
-});

modules/benchmarks_external/src/bootstrap.ts

@@ -1,91 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-
-(function(global: any /** TODO #9100 */) {
-
-  writeScriptTag('/all/benchmarks/vendor/core.js');
-  writeScriptTag('/all/benchmarks/vendor/zone.js');
-  writeScriptTag('/all/benchmarks/vendor/long-stack-trace-zone.js');
-  writeScriptTag('/all/benchmarks/vendor/system.src.js');
-  writeScriptTag('/all/benchmarks/vendor/Reflect.js', 'benchmarksBootstrap()');
-
-  (<any>global).benchmarksBootstrap = benchmarksBootstrap;
-
-  function benchmarksBootstrap() {
-    // check query param
-    const useBundles = location.search.indexOf('bundles=false') == -1;
-    if (useBundles) {
-      System.config({
-        map: {
-          'index': 'index.js',
-          '@angular/core': '/packages-dist/core/bundles/core.umd.js',
-          '@angular/common': '/packages-dist/common/bundles/common.umd.js',
-          '@angular/forms': '/packages-dist/forms/bundles/forms.umd.js',
-          '@angular/compiler': '/packages-dist/compiler/bundles/compiler.umd.js',
-          '@angular/platform-browser':
-              '/packages-dist/platform-browser/bundles/platform-browser.umd.js',
-          '@angular/platform-browser-dynamic':
-              '/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
-          '@angular/http': '/packages-dist/http/bundles/http.umd.js',
-          '@angular/upgrade': '/packages-dist/upgrade/bundles/upgrade.umd.js',
-          '@angular/router': '/packages-dist/router/bundles/router.umd.js',
-          '@angular/core/src/facade': '/all/@angular/core/src/facade',
-          'rxjs': 'node_modules/rxjs',
-        },
-        packages: {
-          'app': {defaultExtension: 'js'},
-          '@angular/core/src/facade': {defaultExtension: 'js'},
-          'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' },
-          'rxjs/operators': {main: 'index.js', defaultExtension: 'js' },
-          'rxjs/testing': {main: 'index.js', defaultExtension: 'js' },
-          'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' },
-          'rxjs': { main: 'index.js', defaultExtension: 'js' },
-        }
-      });
-    } else {
-      console.warn(
-          'Not using the Angular bundles. Don\'t use this configuration for e2e/performance tests!');
-
-      System.config({
-        map: {
-          'index': 'index.js',
-          '@angular': '/all/@angular',
-          'rxjs': 'node_modules/rxjs',
-        },
-        packages: {
-          'app': {defaultExtension: 'js'},
-          '@angular/core': {main: 'index.js', defaultExtension: 'js'},
-          '@angular/compiler': {main: 'index.js', defaultExtension: 'js'},
-          '@angular/router': {main: 'index.js', defaultExtension: 'js'},
-          '@angular/common': {main: 'index.js', defaultExtension: 'js'},
-          '@angular/forms': {main: 'index.js', defaultExtension: 'js'},
-          '@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
-          '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
-          '@angular/upgrade': {main: 'index.js', defaultExtension: 'js'},
-          'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' },
-          'rxjs/operators': {main: 'index.js', defaultExtension: 'js' },
-          'rxjs/testing': {main: 'index.js', defaultExtension: 'js' },
-          'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' },
-          'rxjs': { main: 'index.js', defaultExtension: 'js' },
-        }
-      });
-    }
-
-
-    // BOOTSTRAP the app!
-    System.import('index').then(function(m: any /** TODO #9100 */) {
-      m.main();
-    }, console.error.bind(console));
-  }
-
-
-  function writeScriptTag(scriptUrl: any /** TODO #9100 */, onload?: any /** TODO #9100 */) {
-    document.write(`<script src="${scriptUrl}" onload="${onload}"></script>`);
-  }
-}(window));

modules/benchmarks_external/src/compiler/compiler_benchmark.html

@@ -1,53 +0,0 @@
-<!doctype html>
-<html>
-<body>
-
-<h2>Params</h2>
-<form>
-  Elements:
-  <input type="number" name="elements" placeholder="elements" value="150">
-  <br>
-  <button>Apply</button>
-</form>
-
-<h2>Actions</h2>
-<p>
-  <button id="compileWithBindings">CompileWithBindings</button>
-  <button id="compileNoBindings">CompileNoBindings</button>
-</p>
-
-<template id="templateNoBindings">
-  <div class="class0 class1 class2 class3 class4 " nodir0="" attr0="value0" nodir1="" attr1="value1" nodir2="" attr2="value2" nodir3="" attr3="value3" nodir4="" attr4="value4">
-    <div class="class0 class1 class2 class3 class4 " nodir0="" attr0="value0" nodir1="" attr1="value1" nodir2="" attr2="value2" nodir3="" attr3="value3" nodir4="" attr4="value4">
-      <div class="class0 class1 class2 class3 class4 " nodir0="" attr0="value0" nodir1="" attr1="value1" nodir2="" attr2="value2" nodir3="" attr3="value3" nodir4="" attr4="value4">
-        <div class="class0 class1 class2 class3 class4 " nodir0="" attr0="value0" nodir1="" attr1="value1" nodir2="" attr2="value2" nodir3="" attr3="value3" nodir4="" attr4="value4">
-          <div class="class0 class1 class2 class3 class4 " nodir0="" attr0="value0" nodir1="" attr1="value1" nodir2="" attr2="value2" nodir3="" attr3="value3" nodir4="" attr4="value4">
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<template id="templateWithBindings">
-  <div class="class0 class1 class2 class3 class4 " dir0="" [attr0]="value0" dir1="" [attr1]="value1" dir2="" [attr2]="value2" dir3="" [attr3]="value3" dir4="" [attr4]="value4">
-    {{inter0}}{{inter1}}{{inter2}}{{inter3}}{{inter4}}
-    <div class="class0 class1 class2 class3 class4 " dir0="" [attr0]="value0" dir1="" [attr1]="value1" dir2="" [attr2]="value2" dir3="" [attr3]="value3" dir4="" [attr4]="value4">
-      {{inter0}}{{inter1}}{{inter2}}{{inter3}}{{inter4}}
-      <div class="class0 class1 class2 class3 class4 " dir0="" [attr0]="value0" dir1="" [attr1]="value1" dir2="" [attr2]="value2" dir3="" [attr3]="value3" dir4="" [attr4]="value4">
-        {{inter0}}{{inter1}}{{inter2}}{{inter3}}{{inter4}}
-        <div class="class0 class1 class2 class3 class4 " dir0="" [attr0]="value0" dir1="" [attr1]="value1" dir2="" [attr2]="value2" dir3="" [attr3]="value3" dir4="" [attr4]="value4">
-          {{inter0}}{{inter1}}{{inter2}}{{inter3}}{{inter4}}
-          <div class="class0 class1 class2 class3 class4 " dir0="" [attr0]="value0" dir1="" [attr1]="value1" dir2="" [attr2]="value2" dir3="" [attr3]="value3" dir4="" [attr4]="value4">
-            {{inter0}}{{inter1}}{{inter2}}{{inter3}}{{inter4}}
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-$SCRIPTS$
-
-</body>
-</html>

modules/benchmarks_external/src/compiler/compiler_benchmark.ts

@@ -1,117 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-// compiler benchmark in AngularJS 1.x
-import {getIntParameter, bindAction} from '@angular/testing/src/benchmark_util';
-declare var angular: any;
-
-export function main() {
-  const ngEl = document.createElement('div');
-  angular.bootstrap(ngEl, ['app']);
-}
-
-function loadTemplate(templateId, repeatCount) {
-  const template = document.querySelectorAll(`#${templateId}`)[0];
-  const content = (<HTMLElement>template).innerHTML;
-  let result = '';
-  for (let i = 0; i < repeatCount; i++) {
-    result += content;
-  }
-  // replace [] binding syntax
-  result = result.replace(/[\[\]]/g, '');
-
-  // Use a DIV as container as Angular 1.3 does not know <template> elements...
-  const div = document.createElement('div');
-  div.innerHTML = result;
-  return div;
-}
-
-angular.module('app', [])
-    .directive('dir0',
-               [
-                 '$parse',
-                 function($parse) {
-                   return {
-                     compile: function($element, $attrs) {
-                       const expr = $parse($attrs.attr0);
-                       return ($scope) => $scope.$watch(expr, angular.noop);
-                     }
-                   };
-                 }
-               ])
-    .directive('dir1',
-               [
-                 '$parse',
-                 function($parse) {
-                   return {
-                     compile: function($element, $attrs) {
-                       const expr = $parse($attrs.attr1);
-                       return ($scope) => $scope.$watch(expr, angular.noop);
-                     }
-                   };
-                 }
-               ])
-    .directive('dir2',
-               [
-                 '$parse',
-                 function($parse) {
-                   return {
-                     compile: function($element, $attrs) {
-                       const expr = $parse($attrs.attr2);
-                       return ($scope) => $scope.$watch(expr, angular.noop);
-                     }
-                   };
-                 }
-               ])
-    .directive('dir3',
-               [
-                 '$parse',
-                 function($parse) {
-                   return {
-                     compile: function($element, $attrs) {
-                       const expr = $parse($attrs.attr3);
-                       return ($scope) => $scope.$watch(expr, angular.noop);
-                     }
-                   };
-                 }
-               ])
-    .directive('dir4',
-               [
-                 '$parse',
-                 function($parse) {
-                   return {
-                     compile: function($element, $attrs) {
-                       const expr = $parse($attrs.attr4);
-                       return ($scope) => $scope.$watch(expr, angular.noop);
-                     }
-                   };
-                 }
-               ])
-    .run([
-      '$compile',
-      function($compile) {
-        const count = getIntParameter('elements');
-        const templateNoBindings = loadTemplate('templateNoBindings', count);
-        const templateWithBindings = loadTemplate('templateWithBindings', count);
-
-        bindAction('#compileWithBindings', compileWithBindings);
-        bindAction('#compileNoBindings', compileNoBindings);
-
-        function compileNoBindings() {
-          // Need to clone every time as the compiler might modify the template!
-          const cloned = templateNoBindings.cloneNode(true);
-          $compile(cloned);
-        }
-
-        function compileWithBindings() {
-          // Need to clone every time as the compiler might modify the template!
-          const cloned = templateWithBindings.cloneNode(true);
-          $compile(cloned);
-        }
-      }
-    ]);

modules/benchmarks_external/src/index.html

@@ -1,26 +0,0 @@
-<!doctype html>
-<html>
-<body>
-  <ul>
-    <li>
-      <a href="compiler/compiler_benchmark.html">Compiler benchmark</a>
-    </li>
-    <li>
-      <a href="tree/tree_benchmark.html">Tree benchmark</a>
-    </li>
-    <li>
-      <a href="static_tree/tree_benchmark.html">Static tree benchmark</a>
-    </li>
-    <li>
-      <a href="tree/react/index.html">React Tree benchmark</a>
-    </li>
-    <li>
-      <a href="largetable/largetable_benchmark.html">Largetable benchmark</a>
-    </li>
-    <li>
-      <a href="naive_infinite_scroll/index.html">Naive infinite scroll benchmark</a>
-    </li>
-  </ul>
-
-</body>
-</html>

modules/benchmarks_external/src/largetable/largetable-js-template.html

@@ -1,58 +0,0 @@
-<ng-switch on="benchmarkType">
-  <baseline-binding-table ng-switch-when="baselineBinding">
-  </baseline-binding-table>
-  <baseline-interpolation-table ng-switch-when="baselineInterpolation">
-  </baseline-interpolation-table>
-  <div ng-switch-when="ngBind">
-    <h2>baseline binding</h2>
-    <div ng-repeat="row in data">
-      <span ng-repeat="column in row">
-        <span ng-bind="column.i"></span>:<span ng-bind="column.j"></span>|
-      </span>
-    </div>
-  </div>
-  <div ng-switch-when="ngBindOnce">
-    <h2>baseline binding once</h2>
-    <div ng-repeat="row in data">
-      <span ng-repeat="column in ::row">
-        <span ng-bind="::column.i"></span>:<span ng-bind="::column.j"></span>|
-      </span>
-    </div>
-  </div>
-  <div ng-switch-when="interpolation">
-    <h2>baseline interpolation</h2>
-    <div ng-repeat="row in data">
-      <span ng-repeat="column in row">{{column.i}}:{{column.j}}|</span>
-    </div>
-  </div>
-  <div ng-switch-when="interpolationAttr">
-    <h2>attribute interpolation</h2>
-    <div ng-repeat="row in data">
-      <span ng-repeat="column in row" i="{{column.i}}" j="{{column.j}}">i,j attrs</span>
-    </div>
-  </div>
-  <div ng-switch-when="ngBindFn">
-    <h2>bindings with functions</h2>
-    <div ng-repeat="row in data">
-      <span ng-repeat="column in row"><span ng-bind="column.iFn()"></span>:<span ng-bind="column.jFn()"></span>|</span>
-    </div>
-  </div>
-  <div ng-switch-when="interpolationFn">
-    <h2>interpolation with functions</h2>
-    <div ng-repeat="row in data">
-      <span ng-repeat="column in row">{{column.iFn()}}:{{column.jFn()}}|</span>
-    </div>
-  </div>
-  <div ng-switch-when="ngBindFilter">
-    <h2>bindings with filter</h2>
-    <div ng-repeat="row in data">
-      <span ng-repeat="column in row"><span ng-bind="column.i | noop"></span>:<span ng-bind="column.j | noop"></span>|</span>
-    </div>
-  </div>
-  <div ng-switch-when="interpolationFilter">
-    <h2>interpolation with filter</h2>
-    <div ng-repeat="row in data">
-      <span ng-repeat="column in row">{{column.i | noop}}:{{column.j | noop}}|</span>
-    </div>
-  </div>
-</ng-switch>

modules/benchmarks_external/src/largetable/largetable_benchmark.html

@@ -1,98 +0,0 @@
-<!doctype html>
-<html>
-<body>
-
-<h2>AngularJS/Dart 1.x largetable benchmark</h2>
-<form>
-  <div>
-    rows:
-    <input type="number" name="rows" value="100">
-    columns:
-    <input type="number" name="columns" value="20">
-  </div>
-  <div>
-    baseline binding:
-    <input type="radio"
-           name="benchmarkType"
-           value="baselineBinding"
-           id="baselineBinding"
-           checked>
-  </div>
-  <div>
-    baseline interpolation:
-    <input type="radio"
-           name="benchmarkType"
-           value="baselineInterpolation"
-           id="baselineInterpolation">
-  </div>
-  <div>
-    ngBind:
-    <input type="radio"
-           name="benchmarkType"
-           value="ngBind"
-           id="ngBind">
-  </div>
-  <div>
-    ngBindOnce:
-    <input type="radio"
-           name="benchmarkType"
-           value="ngBindOnce"
-           id="ngBindOnce">
-  </div>
-  <div>
-    interpolation:
-    <input type="radio"
-           name="benchmarkType"
-           value="interpolation"
-           id="interpolation">
-  </div>
-  <div>
-    attribute interpolation:
-    <input type="radio"
-           name="benchmarkType"
-           value="interpolationAttr"
-           id="interpolationAttr">
-  </div>
-  <div>
-    ngBind + fnInvocation:
-    <input type="radio"
-           name="benchmarkType"
-           value="ngBindFn"
-           id="ngBindFn">
-  </div>
-  <div>
-    interpolation + fnInvocation:
-    <input type="radio"
-           name="benchmarkType"
-           value="interpolationFn"
-           id="interpolationFn">
-  </div>
-  <div>
-    ngBind + filter:
-    <input type="radio"
-           name="benchmarkType"
-           value="ngBindFilter"
-           id="ngBindFilter">
-  </div>
-  <div>
-    interpolation + filter:
-    <input type="radio"
-           name="benchmarkType"
-           value="interpolationFilter"
-           id="interpolationFilter">
-  </div>
-  <button>Apply</button>
-</form>
-
-<p>
-<button id="destroyDom">destroyDom</button>
-<button id="createDom">createDom</button>
-</p>
-
-<div>
-<largetable></largetable>
-</div>
-
-$SCRIPTS$
-</body>
-</html>

modules/benchmarks_external/src/largetable/largetable_benchmark.ts

@@ -1,119 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {getIntParameter, getStringParameter, bindAction} from '@angular/testing/src/benchmark_util';
-declare var angular: any;
-
-const totalRows = getIntParameter('rows');
-const totalColumns = getIntParameter('columns');
-const benchmarkType = getStringParameter('benchmarkType');
-
-export function main() {
-  angular.bootstrap(document.querySelector('largetable'), ['app']);
-}
-
-angular.module('app', [])
-    .config(function($compileProvider) {
-      if ($compileProvider.debugInfoEnabled) {
-        $compileProvider.debugInfoEnabled(false);
-      }
-    })
-    .filter('noop', function() { return function(input) { return input; }; })
-    .directive('largetable',
-               function() {
-                 return {
-                   restrict: 'E',
-                   templateUrl: 'largetable-js-template.html',
-                   controller: 'DataController'
-                 };
-               })
-    .controller('DataController',
-                function($scope) {
-                  bindAction('#destroyDom', destroyDom);
-                  bindAction('#createDom', createDom);
-
-                  function destroyDom() {
-                    $scope.$apply(function() { $scope.benchmarkType = 'none'; });
-                  }
-
-                  function createDom() {
-                    $scope.$apply(function() { $scope.benchmarkType = benchmarkType; });
-                  }
-
-                  const data = $scope.data = [];
-
-                  function iGetter() { return this.i; }
-                  function jGetter() { return this.j; }
-
-                  for (let i = 0; i < totalRows; i++) {
-                    data[i] = [];
-                    for (let j = 0; j < totalColumns; j++) {
-                      data[i][j] = {i: i, j: j, iFn: iGetter, jFn: jGetter};
-                    }
-                  }
-                })
-    .directive('baselineBindingTable',
-               function() {
-                 return {
-                   restrict: 'E',
-                   link: function($scope, $element) {
-                     let i, j, row, cell, comment;
-                     const template = document.createElement('span');
-                     template.setAttribute('ng-repeat', 'foo in foos');
-                     template.classList.add('ng-scope');
-                     template.appendChild(document.createElement('span'));
-                     template.appendChild(document.createTextNode(':'));
-                     template.appendChild(document.createElement('span'));
-                     template.appendChild(document.createTextNode('|'));
-
-                     for (i = 0; i < totalRows; i++) {
-                       row = document.createElement('div');
-                       $element[0].appendChild(row);
-                       for (j = 0; j < totalColumns; j++) {
-                         cell = template.cloneNode(true);
-                         row.appendChild(cell);
-                         cell.childNodes[0].textContent = i;
-                         cell.childNodes[2].textContent = j;
-                         cell.ng3992 = 'xxx';
-                         comment = document.createComment('ngRepeat end: bar in foo');
-                         row.appendChild(comment);
-                       }
-
-                       comment = document.createComment('ngRepeat end: foo in foos');
-                       $element[0].appendChild(comment);
-                     }
-                   }
-                 };
-               })
-    .directive('baselineInterpolationTable', function() {
-      return {
-        restrict: 'E',
-        link: function($scope, $element) {
-          let i, j, row, cell, comment;
-          const template = document.createElement('span');
-          template.setAttribute('ng-repeat', 'foo in foos');
-          template.classList.add('ng-scope');
-
-          for (i = 0; i < totalRows; i++) {
-            row = document.createElement('div');
-            $element[0].appendChild(row);
-            for (j = 0; j < totalColumns; j++) {
-              cell = template.cloneNode(true);
-              row.appendChild(cell);
-              cell.textContent = '' + i + ':' + j + '|';
-              cell.ng3992 = 'xxx';
-              comment = document.createComment('ngRepeat end: bar in foo');
-              row.appendChild(comment);
-            }
-
-            comment = document.createComment('ngRepeat end: foo in foos');
-            $element[0].appendChild(comment);
-          }
-        }
-      };
-    });

modules/benchmarks_external/src/naive_infinite_scroll/index.html

@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>AngularDart Scrolling Benchmark</title>
-</head>
-<body>
-  <form>
-    App size: <input type="text" name="appSize" value="1"><br>
-    Iteration count: <input type="text" name="iterationCount" value="1"><br>
-    Scroll increment: <input type="text" name="scrollIncrement" value="1"><br>
-  </form>
-  <div>
-    <button id="run-btn">Run</button>
-    <button id="reset-btn">Reset</button>
-  </div>
-  <scroll-app></scroll-app>
-
-  $SCRIPTS$
-</body>
-</html>

modules/benchmarks_external/src/naive_infinite_scroll/scroll_area.html

@@ -1,13 +0,0 @@
-<div>
-    <div id="scrollDiv"
-         ng-style="scrollDivStyle"
-         ng-scroll="onScroll()">
-        <div ng-style="paddingStyle"></div>
-        <div ng-style="innerStyle">
-            <scroll-item
-                ng-repeat="item in visibleItems"
-                offering="item">
-            </scroll-item>
-        </div>
-    </div>
-</div>

modules/benchmarks_external/src/naive_infinite_scroll/scroll_item.html

@@ -1,45 +0,0 @@
-<div ng-style="itemStyle">
-    <company-name company="offering.company"
-                  cell-width="companyNameWidth">
-    </company-name>
-
-    <opportunity-name opportunity="offering.opportunity"
-                      cell-width="opportunityNameWidth">
-    </opportunity-name>
-
-    <offering-name offering="offering"
-                   cell-width="offeringNameWidth">
-    </offering-name>
-
-    <account-cell account="offering.account"
-                  cell-width="accountCellWidth">
-    </account-cell>
-
-    <formatted-cell value="offering.basePoints"
-                    cell-width="basePointsWidth">
-    </formatted-cell>
-
-    <formatted-cell value="offering.kickerPoints"
-                    cell-width="kickerPointsWidth">
-    </formatted-cell>
-
-    <stage-buttons offering="offering"
-                   cell-width="stageButtonsWidth">
-    </stage-buttons>
-
-    <formatted-cell value="offering.bundles"
-                    cell-width="bundlesWidth">
-    </formatted-cell>
-
-    <formatted-cell value="offering.dueDate"
-                    cell-width="dueDateWidth">
-    </formatted-cell>
-
-    <formatted-cell value="offering.endDate"
-                    cell-width="endDateWidth">
-    </formatted-cell>
-
-    <formatted-cell value="offering.aatStatus"
-                    cell-width="aatStatusWidth">
-    </formatted-cell>
-</div>

modules/benchmarks_external/src/static_tree/tree_benchmark.html

@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-<body>
-
-<h2>AngularJS/Dart 1.x static tree benchmark (depth 10)</h2>
-<p>
-<button id="destroyDom">destroyDom</button>
-<button id="createDom">createDom</button>
-</p>
-
-<div>
-<tree9 data="initData" ng-if="initData != null" class="app"></tree9>
-</div>
-
-$SCRIPTS$
-</body>
-</html>

modules/benchmarks_external/src/static_tree/tree_benchmark.ts

@@ -1,77 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-// static tree benchmark in AngularJS 1.x
-import {getIntParameter, bindAction} from '@angular/testing/src/benchmark_util';
-declare var angular: any;
-
-const MAX_DEPTH = 10;
-
-export function main() {
-  angular.bootstrap(document.querySelector('.app'), ['app']);
-}
-
-function addTreeDirective(module, level: number) {
-  let template;
-  if (level <= 0) {
-    template = `<span> {{data.value}}</span>`;
-  } else {
-    template = `<span> {{data.value}} <tree${level-1} data='data.right'></tree${level-1}><tree${level-1} data='data.left'></tree${level-1}></span>`;
-  }
-  module.directive(`tree${level}`, function() { return {scope: {data: '='}, template: template}; });
-}
-
-const module = angular.module('app', []);
-for (let depth = 0; depth < MAX_DEPTH; depth++) {
-  addTreeDirective(module, depth);
-}
-module.config([
-        '$compileProvider',
-        function($compileProvider) { $compileProvider.debugInfoEnabled(false); }
-      ])
-    .run([
-      '$rootScope',
-      function($rootScope) {
-        let count = 0;
-        $rootScope.initData = null;
-
-        bindAction('#destroyDom', destroyDom);
-        bindAction('#createDom', createDom);
-
-        function createData(): TreeNode {
-          const values = count++ % 2 == 0 ? ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '*'] :
-                                          ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', '-'];
-          return buildTree(MAX_DEPTH, values, 0);
-        }
-
-        function destroyDom() {
-          $rootScope.$apply(function() { $rootScope.initData = null; });
-        }
-
-        function createDom() {
-          $rootScope.$apply(function() { $rootScope.initData = createData(); });
-        }
-      }
-    ]);
-
-class TreeNode {
-  value: string;
-  left: TreeNode;
-  right: TreeNode;
-  constructor(value, left, right) {
-    this.value = value;
-    this.left = left;
-    this.right = right;
-  }
-}
-
-function buildTree(maxDepth, values, curDepth) {
-  if (maxDepth === curDepth) return new TreeNode('', null, null);
-  return new TreeNode(values[curDepth], buildTree(maxDepth, values, curDepth + 1),
-                      buildTree(maxDepth, values, curDepth + 1));
-}

modules/benchmarks_external/src/tree/react/index.html

@@ -1,23 +0,0 @@
-<!doctype html>
-<html>
-<head>
-</head>
-<body>
-
-<h2>Params</h2>
-<form>
-  Depth:
-  <input type="number" name="depth" placeholder="depth" value="9">
-  <br>
-  <button>Apply</button>
-</form>
-<button id="destroyDom">destroyDom</button>
-<button id="createDom">createDom</button>
-
-<h2>React Tree Benchmark</h2>
-<root-tree id="rootTree"></root-tree>
-
-$SCRIPTS$
-
-</body>
-</html>

modules/benchmarks_external/src/tree/react/index.ts

@@ -1,73 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-// tree benchmark in React
-import {getIntParameter, bindAction} from '@angular/testing/src/benchmark_util';
-import * as React from './react.min';
-
-const TreeComponent = React.createClass({
-  displayName: 'TreeComponent',
-
-  render: function() {
-    const treeNode = this.props.treeNode;
-
-    let left = null;
-    if (treeNode.left) {
-      left = React.createElement(
-          "span", {}, [React.createElement(TreeComponent, {treeNode: treeNode.left}, "")]);
-    }
-
-    let right = null;
-    if (treeNode.right) {
-      right = React.createElement(
-          "span", {}, [React.createElement(TreeComponent, {treeNode: treeNode.right}, "")]);
-    }
-
-    const span = React.createElement("span", {}, [" " + treeNode.value, left, right]);
-
-    return (React.createElement("tree", {}, [span]));
-  }
-});
-
-export function main() {
-  let count = 0;
-  const maxDepth = getIntParameter('depth');
-
-  bindAction('#destroyDom', destroyDom);
-  bindAction('#createDom', createDom);
-
-  const empty = new TreeNode(0, null, null);
-  const rootComponent = React.render(React.createElement(TreeComponent, {treeNode: empty}, ""),
-                                   document.getElementById('rootTree'));
-
-  function destroyDom() { rootComponent.setProps({treeNode: empty}); }
-
-  function createDom() {
-    const values = count++ % 2 == 0 ? ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '*'] :
-                                    ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', '-'];
-    rootComponent.setProps({treeNode: buildTree(maxDepth, values, 0)});
-  }
-}
-
-class TreeNode {
-  value: string;
-  left: TreeNode;
-  right: TreeNode;
-
-  constructor(value, left, right) {
-    this.value = value;
-    this.left = left;
-    this.right = right;
-  }
-}
-
-function buildTree(maxDepth, values, curDepth) {
-  if (maxDepth === curDepth) return new TreeNode('', null, null);
-  return new TreeNode(values[curDepth], buildTree(maxDepth, values, curDepth + 1),
-                      buildTree(maxDepth, values, curDepth + 1));
-}

modules/benchmarks_external/src/tree/react/react.min.d.ts

@@ -1,3 +0,0 @@
-export var createElement: Function;
-export var render: Function;
-export var createClass: Function;

modules/benchmarks_external/src/tree/tree_benchmark.html

@@ -1,25 +0,0 @@
-<!doctype html>
-<html>
-<body>
-
-<h2>Params</h2>
-<form>
-  Depth:
-  <input type="number" name="depth" placeholder="depth" value="9">
-  <br>
-  <button>Apply</button>
-</form>
-
-<h2>AngularJS/Dart 1.x tree benchmark</h2>
-<p>
-<button id="destroyDom">destroyDom</button>
-<button id="createDom">createDom</button>
-</p>
-
-<div>
-<tree data="initData"></tree>
-</div>
-
-$SCRIPTS$
-</body>
-</html>

modules/benchmarks_external/src/tree/tree_benchmark.ts

@@ -1,107 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-// tree benchmark in AngularJS 1.x
-import {getIntParameter, bindAction} from '@angular/testing/src/benchmark_util';
-declare var angular: any;
-
-export function main() {
-  angular.bootstrap(document.querySelector('tree'), ['app']);
-}
-
-angular.module('app', [])
-    .directive('tree',
-               function() {
-                 return {
-                   scope: {data: '='},
-                   template: '<span> {{data.value}}' +
-                                 '  <span tree-if="data.left"></span>' +
-                                 '  <span tree-if="data.right"></span>' +
-                                 '</span>'
-                 };
-               })
-    // special directive for "if" as angular 1.3 does not support
-    // recursive components.
-    .directive('treeIf',
-               [
-                 '$compile',
-                 '$parse',
-                 function($compile, $parse) {
-                   const transcludeFn;
-                   return {
-                     compile: function(element, attrs) {
-                       const expr = $parse('!!' + attrs.treeIf);
-                       const template = '<tree data="' + attrs.treeIf + '"></tree>';
-                       let transclude;
-                       return function($scope, $element, $attrs) {
-                         if (!transclude) {
-                           transclude = $compile(template);
-                         }
-                         let childScope;
-                         let childElement;
-                         $scope.$watch(expr, function(newValue) {
-                           if (childScope) {
-                             childScope.$destroy();
-                             childElement.remove();
-                             childScope = null;
-                             childElement = null;
-                           }
-                           if (newValue) {
-                             childScope = $scope.$new();
-                             childElement = transclude(childScope,
-                                                       function(clone) { $element.append(clone); });
-                           }
-                         });
-                       };
-
-                     }
-                   };
-                 }
-               ])
-    .config([
-      '$compileProvider',
-      function($compileProvider) { $compileProvider.debugInfoEnabled(false); }
-    ])
-    .run([
-      '$rootScope',
-      function($rootScope) {
-        let count = 0;
-        const maxDepth = getIntParameter('depth');
-
-        bindAction('#destroyDom', destroyDom);
-        bindAction('#createDom', createDom);
-
-        function destroyDom() {
-          $rootScope.$apply(function() { $rootScope.initData = new TreeNode('', null, null); });
-        }
-
-        function createDom() {
-          const values = count++ % 2 == 0 ? ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '*'] :
-                                          ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', '-'];
-
-          $rootScope.$apply(function() { $rootScope.initData = buildTree(maxDepth, values, 0); });
-        }
-      }
-    ]);
-
-class TreeNode {
-  value: string;
-  left: TreeNode;
-  right: TreeNode;
-  constructor(value, left, right) {
-    this.value = value;
-    this.left = left;
-    this.right = right;
-  }
-}
-
-function buildTree(maxDepth, values, curDepth) {
-  if (maxDepth === curDepth) return new TreeNode('', null, null);
-  return new TreeNode(values[curDepth], buildTree(maxDepth, values, curDepth + 1),
-                      buildTree(maxDepth, values, curDepth + 1));
-}

modules/system.d.ts

@@ -1,4 +1,10 @@
 /**
- * Dummy typings for systemjs.
+ * @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
  */
+
+/** Dummy typings for systemjs. */
 declare var System: any;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "9.0.3",
+  "version": "9.0.6",
   "private": true,
   "description": "Angular - a web framework for modern web apps",
   "homepage": "https://github.com/angular/angular",
@@ -30,7 +30,9 @@
     "bazel": "bazel",
     "//circleci-win-comment": "See the test-win circleci job for why these are needed. If they are not needed anymore, remove them.",
     "circleci-win-ve": "bazel test --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only,-browser:chromium-local //packages/compiler-cli/... //tools/ts-api-guardian/...",
-    "circleci-win-ivy": "bazel test --config=ivy --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot --test_tag_filters=-no-ivy-aot,-fixme-ivy-aot,-browser:chromium-local //packages/compiler-cli/... //tools/ts-api-guardian/..."
+    "circleci-win-ivy": "bazel test --config=ivy --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot --test_tag_filters=-no-ivy-aot,-fixme-ivy-aot,-browser:chromium-local //packages/compiler-cli/... //tools/ts-api-guardian/...",
+    "lint": "yarn -s tslint && yarn gulp lint",
+    "tslint": "tsc -p tools/tsconfig.json && tslint -c tslint.json \"+(packages|modules|scripts|tools)/**/*.+(js|ts)\""
   },
   "// 1": "dependencies are used locally and by bazel",
   "dependencies": {
@@ -40,8 +42,11 @@
     "@angular-devkit/core": "9.0.3",
     "@angular-devkit/schematics": "9.0.3",
     "@angular/bazel": "file:./tools/npm/@angular_bazel",
-    "@babel/core": "7.8.3",
+    "@babel/core": "^7.8.6",
-    "@babel/generator": "7.8.3",
+    "@babel/generator": "^7.8.6",
+    "@babel/template": "^7.8.6",
+    "@babel/traverse": "^7.8.6",
+    "@babel/types": "^7.8.6",
     "@bazel/jasmine": "1.3.0",
     "@bazel/karma": "1.3.0",
     "@bazel/protractor": "1.3.0",
@@ -51,8 +56,10 @@
     "@microsoft/api-extractor": "^7.3.9",
     "@schematics/angular": "9.0.3",
     "@types/angular": "^1.6.47",
-    "@types/babel__core": "^7.1.3",
+    "@types/babel__core": "^7.1.6",
     "@types/babel__generator": "^7.6.1",
+    "@types/babel__template": "^7.0.2",
+    "@types/babel__traverse": "^7.0.9",
     "@types/base64-js": "1.2.5",
     "@types/bluebird": "^3.5.27",
     "@types/chai": "^4.1.2",
@@ -71,7 +78,7 @@
     "@types/systemjs": "0.19.32",
     "@types/yaml": "^1.2.0",
     "@types/yargs": "^11.1.1",
-    "@webcomponents/custom-elements": "^1.0.4",
+    "@webcomponents/custom-elements": "^1.1.0",
     "angular": "npm:angular@1.7",
     "angular-1.5": "npm:angular@1.5",
     "angular-1.6": "npm:angular@1.6",
@@ -127,7 +134,7 @@
     "terser": "^4.4.0",
     "tsickle": "0.38.0",
     "tslib": "^1.10.0",
-    "tslint": "5.7.0",
+    "tslint": "6.0.0",
     "typescript": "~3.7.4",
     "xhr2": "0.1.4",
     "yaml": "^1.7.2",
@@ -140,6 +147,7 @@
     "@bazel/bazel": "2.1.0",
     "@bazel/buildifier": "^0.29.0",
     "@bazel/ibazel": "^0.11.1",
+    "@octokit/graphql": "^4.3.1",
     "@types/minimist": "^1.2.0",
     "@yarnpkg/lockfile": "^1.1.0",
     "browserstacktunnel-wrapper": "2.0.1",
@@ -168,9 +176,11 @@
     "rewire": "2.5.2",
     "sauce-connect": "https://saucelabs.com/downloads/sc-4.5.1-linux.tar.gz",
     "semver": "^6.3.0",
-    "tslint-eslint-rules": "4.1.1",
+    "ts-node": "^8.6.2",
+    "tslint-eslint-rules": "5.4.0",
     "tslint-no-toplevel-property-access": "0.0.2",
     "tsutils": "2.27.2",
+    "typed-graphqlify": "^2.3.0",
     "universal-analytics": "0.4.15",
     "vlq": "0.2.2",
     "vrsource-tslint-rules": "5.1.1"

packages/bazel/src/builders/schema.d.ts

@@ -1,9 +1,10 @@
-
+/**
-// THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
+ * @license
-// CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
+ * Copyright Google Inc. All Rights Reserved.
-
+ *
-// tslint:disable:no-global-tslint-disable
+ * Use of this source code is governed by an MIT-style license that can be
-// tslint:disable
+ * found in the LICENSE file at https://angular.io/license
+ */
 
 /**
  * Options for Bazel Builder

packages/bazel/src/ng_module.bzl

@@ -318,7 +318,12 @@ def _ngc_tsconfig(ctx, files, srcs, **kwargs):
         "createExternalSymbolFactoryReexports": (not _is_bazel()),
         # FIXME: wrong place to de-dupe
         "expectedOut": depset([o.path for o in expected_outs]).to_list(),
+        # We instruct the compiler to use the host for import generation in Blaze. By default,
+        # module names between source files of the same compilation unit are relative paths. This
+        # is not desired in google3 where the generated module names are used as qualified names
+        # for aliased exports. We disable relative paths and always use manifest paths in google3.
         "_useHostForImportGeneration": (not _is_bazel()),
+        "_useManifestPathsAsModuleName": (not _is_bazel()),
     }
 
     if _should_produce_flat_module_outs(ctx):

packages/bazel/src/ng_package/ng_package.bzl

@@ -77,7 +77,7 @@ def _convert_dash_case_to_camel_case(s):
     parts = s.split("-")
 
     # First letter in the result is always unchanged
-    return s[0] + "".join([p.title() for p in parts])[1:]
+    return s[0] + "".join([p.capitalize() for p in parts])[1:]
 
 # Convert from a package name on npm to an identifier that's a legal global symbol
 #  @angular/core -> ng.core
@@ -640,7 +640,7 @@ _NG_PACKAGE_ATTRS = dict(PKG_NPM_ATTRS, **{
     "entry_point": attr.label(
         doc = """The starting point of the application, passed as the `--input` flag to rollup.
 
-        If the entry JavaScript file belongs to the same package (as the BUILD file), 
+        If the entry JavaScript file belongs to the same package (as the BUILD file),
         you can simply reference it by its relative name to the package directory:
 
         ```
@@ -668,7 +668,7 @@ _NG_PACKAGE_ATTRS = dict(PKG_NPM_ATTRS, **{
 
         The rule will use the corresponding `.js` output of the ts_library rule as the entry point.
 
-        If the entry point target is a rule, it should produce a single JavaScript entry file that will be passed to the nodejs_binary rule. 
+        If the entry point target is a rule, it should produce a single JavaScript entry file that will be passed to the nodejs_binary rule.
         For example:
 
         ```

packages/bazel/src/ngc-wrapped/index.ts

@@ -113,19 +113,17 @@ export function runOneBuild(args: string[], inputs?: {[path: string]: string}):
     }
   }
 
-  const expectedOuts = config['angularCompilerOptions']['expectedOut'];
+  // These are options passed through from the `ng_module` rule which aren't supported
+  // by the `@angular/compiler-cli` and are only intended for `ngc-wrapped`.
+  const {expectedOut, _useManifestPathsAsModuleName} = config['angularCompilerOptions'];
 
   const {basePath} = ng.calcProjectFileAndBasePath(project);
   const compilerOpts = ng.createNgCompilerOptions(basePath, config, tsOptions);
   const tsHost = ts.createCompilerHost(compilerOpts, true);
   const {diagnostics} = compile({
     allDepsCompiledWithBazel: ALL_DEPS_COMPILED_WITH_BAZEL,
-    compilerOpts,
+    useManifestPathsAsModuleName: _useManifestPathsAsModuleName,
-    tsHost,
+    expectedOuts: expectedOut, compilerOpts, tsHost, bazelOpts, files, inputs,
-    bazelOpts,
-    files,
-    inputs,
-    expectedOuts
   });
   if (diagnostics.length) {
     console.error(ng.formatDiagnostics(diagnostics));
@@ -144,9 +142,11 @@ export function relativeToRootDirs(filePath: string, rootDirs: string[]): string
   return filePath;
 }
 
-export function compile({allDepsCompiledWithBazel = true, compilerOpts, tsHost, bazelOpts, files,
+export function compile({allDepsCompiledWithBazel = true, useManifestPathsAsModuleName,
-                         inputs, expectedOuts, gatherDiagnostics, bazelHost}: {
+                         compilerOpts, tsHost, bazelOpts, files, inputs, expectedOuts,
+                         gatherDiagnostics, bazelHost}: {
   allDepsCompiledWithBazel?: boolean,
+  useManifestPathsAsModuleName?: boolean,
   compilerOpts: ng.CompilerOptions,
   tsHost: ts.CompilerHost, inputs?: {[path: string]: string},
   bazelOpts: BazelOptions,
@@ -199,13 +199,14 @@ export function compile({allDepsCompiledWithBazel = true, compilerOpts, tsHost,
     throw new Error(`Couldn't find bazel bin in the rootDirs: ${compilerOpts.rootDirs}`);
   }
 
-  const expectedOutsSet = new Set(expectedOuts.map(p => p.replace(/\\/g, '/')));
+  const expectedOutsSet = new Set(expectedOuts.map(p => convertToForwardSlashPath(p)));
 
   const originalWriteFile = tsHost.writeFile.bind(tsHost);
   tsHost.writeFile =
       (fileName: string, content: string, writeByteOrderMark: boolean,
        onError?: (message: string) => void, sourceFiles?: ts.SourceFile[]) => {
-        const relative = relativeToRootDirs(fileName.replace(/\\/g, '/'), [compilerOpts.rootDir]);
+        const relative =
+            relativeToRootDirs(convertToForwardSlashPath(fileName), [compilerOpts.rootDir]);
         if (expectedOutsSet.has(relative)) {
           expectedOutsSet.delete(relative);
           originalWriteFile(fileName, content, writeByteOrderMark, onError, sourceFiles);
@@ -290,20 +291,32 @@ export function compile({allDepsCompiledWithBazel = true, compilerOpts, tsHost,
 
   const ngHost = ng.createCompilerHost({options: compilerOpts, tsHost: bazelHost});
   const fileNameToModuleNameCache = new Map<string, string>();
-  ngHost.fileNameToModuleName = (importedFilePath: string, containingFilePath: string) => {
+  ngHost.fileNameToModuleName = (importedFilePath: string, containingFilePath?: string) => {
+    const cacheKey = `${importedFilePath}:${containingFilePath}`;
     // Memoize this lookup to avoid expensive re-parses of the same file
     // When run as a worker, the actual ts.SourceFile is cached
     // but when we don't run as a worker, there is no cache.
     // For one example target in g3, we saw a cache hit rate of 7590/7695
-    if (fileNameToModuleNameCache.has(importedFilePath)) {
+    if (fileNameToModuleNameCache.has(cacheKey)) {
-      return fileNameToModuleNameCache.get(importedFilePath);
+      return fileNameToModuleNameCache.get(cacheKey);
     }
-    const result = doFileNameToModuleName(importedFilePath);
+    const result = doFileNameToModuleName(importedFilePath, containingFilePath);
-    fileNameToModuleNameCache.set(importedFilePath, result);
+    fileNameToModuleNameCache.set(cacheKey, result);
     return result;
   };
 
-  function doFileNameToModuleName(importedFilePath: string): string {
+  function doFileNameToModuleName(importedFilePath: string, containingFilePath?: string): string {
+    const relativeTargetPath =
+        relativeToRootDirs(importedFilePath, compilerOpts.rootDirs).replace(EXT, '');
+    const manifestTargetPath = `${bazelOpts.workspaceName}/${relativeTargetPath}`;
+    if (useManifestPathsAsModuleName === true) {
+      return manifestTargetPath;
+    }
+
+    // Unless manifest paths are explicitly enforced, we initially check if a module name is
+    // set for the given source file. The compiler host from `@bazel/typescript` sets source
+    // file module names if the compilation targets either UMD or AMD. To ensure that the AMD
+    // module names match, we first consider those.
     try {
       const sourceFile = ngHost.getSourceFile(importedFilePath, ts.ScriptTarget.Latest);
       if (sourceFile && sourceFile.moduleName) {
@@ -342,11 +355,31 @@ export function compile({allDepsCompiledWithBazel = true, compilerOpts, tsHost,
         ngHost.amdModuleName) {
       return ngHost.amdModuleName({ fileName: importedFilePath } as ts.SourceFile);
     }
-    const result = relativeToRootDirs(importedFilePath, compilerOpts.rootDirs).replace(EXT, '');
+
-    if (result.startsWith(NODE_MODULES)) {
+    // If no AMD module name has been set for the source file by the `@bazel/typescript` compiler
-      return result.substr(NODE_MODULES.length);
+    // host, and the target file is not part of a flat module node module package, we use the
+    // following rules (in order):
+    //    1. If target file is part of `node_modules/`, we use the package module name.
+    //    2. If no containing file is specified, or the target file is part of a different
+    //       compilation unit, we use a Bazel manifest path. Relative paths are not possible
+    //       since we don't have a containing file, and the target file could be located in the
+    //       output directory, or in an external Bazel repository.
+    //    3. If both rules above didn't match, we compute a relative path between the source files
+    //       since they are part of the same compilation unit.
+    // Note that we don't want to always use (2) because it could mean that compilation outputs
+    // are always leaking Bazel-specific paths, and the output is not self-contained. This could
+    // break `esm2015` or `esm5` output for Angular package release output
+    // Omit the `node_modules` prefix if the module name of an NPM package is requested.
+    if (relativeTargetPath.startsWith(NODE_MODULES)) {
+      return relativeTargetPath.substr(NODE_MODULES.length);
+    } else if (
+        containingFilePath == null || !bazelOpts.compilationTargetSrc.includes(importedFilePath)) {
+      return manifestTargetPath;
     }
-    return bazelOpts.workspaceName + '/' + result;
+    const containingFileDir =
+        path.dirname(relativeToRootDirs(containingFilePath, compilerOpts.rootDirs));
+    const relativeImportPath = path.posix.relative(containingFileDir, relativeTargetPath);
+    return relativeImportPath.startsWith('.') ? relativeImportPath : `./${relativeImportPath}`;
   }
 
   ngHost.toSummaryFileName = (fileName: string, referringSrcFileName: string) => path.posix.join(
@@ -464,6 +497,10 @@ function isCompilationTarget(bazelOpts: BazelOptions, sf: ts.SourceFile): boolea
       (bazelOpts.compilationTargetSrc.indexOf(sf.fileName) !== -1);
 }
 
+function convertToForwardSlashPath(filePath: string): string {
+  return filePath.replace(/\\/g, '/');
+}
+
 function gatherDiagnosticsForInputsOnly(
     options: ng.CompilerOptions, bazelOpts: BazelOptions,
     ngProgram: ng.Program): (ng.Diagnostic | ts.Diagnostic)[] {

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

@@ -1,9 +1,10 @@
-
+/**
-// THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
+ * @license
-// CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
+ * Copyright Google Inc. All Rights Reserved.
-
+ *
-// tslint:disable:no-global-tslint-disable
+ * Use of this source code is governed by an MIT-style license that can be
-// tslint:disable
+ * found in the LICENSE file at https://angular.io/license
+ */
 
 export interface Schema {
   /**

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

@@ -1,8 +1,11 @@
+/**
+ * @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
+ */
 
-// THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
-// CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
-
-// tslint:disable
 export interface Schema {
   /**
    * Initial git repository commit information.

packages/bazel/test/ng_package/example/BUILD.bazel

@@ -31,6 +31,8 @@ ng_package(
     ],
     deps = [
         ":example",
+        "//packages/bazel/test/ng_package/example/a11y",
+        "//packages/bazel/test/ng_package/example/imports",
         "//packages/bazel/test/ng_package/example/secondary",
     ],
 )

packages/bazel/test/ng_package/example/a11y/BUILD.bazel

@@ -0,0 +1,12 @@
+load("//tools:defaults.bzl", "ng_module")
+
+package(default_visibility = ["//packages/bazel/test:__subpackages__"])
+
+ng_module(
+    name = "a11y",
+    srcs = glob(["*.ts"]),
+    module_name = "example/a11y",
+    deps = [
+        "//packages/core",
+    ],
+)

packages/bazel/test/ng_package/example/a11y/index.ts

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

packages/bazel/test/ng_package/example/a11y/public-api.ts

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

packages/bazel/test/ng_package/example/imports/BUILD.bazel

@@ -0,0 +1,12 @@
+load("//tools:defaults.bzl", "ng_module")
+
+package(default_visibility = ["//packages/bazel/test:__subpackages__"])
+
+ng_module(
+    name = "imports",
+    srcs = glob(["*.ts"]),
+    module_name = "example/imports",
+    deps = [
+        "//packages/core",
+    ],
+)

packages/bazel/test/ng_package/example/imports/index.ts

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

packages/bazel/test/ng_package/example/imports/public-api.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Injectable} from '@angular/core';
+import {MySecondService} from './second';
+
+@Injectable({providedIn: 'root'})
+export class MyService {
+  constructor(public secondService: MySecondService) {}
+}

packages/bazel/test/ng_package/example/imports/second.ts

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